diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a763f45..b709c7f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base
   before_filter :authenticate_user
   before_filter :increase_traffic_counter
 
-  TRAFFIC_DECREMENTER = 0.05
+  TRAFFIC_DECREMENTER = 0.15
 
   def authenticate_user
     if session[:u]
@@ -28,6 +28,10 @@ class ApplicationController < ActionController::Base
       Keystore.put("traffic:date", Time.now.to_i)
       Keystore.put("traffic:hits", (@traffic * 100.0).to_i)
     end
+
+    Rails.logger.info "  Traffic level: #{@traffic}"
+
+    true
   end
 
   def require_logged_in_user
diff --git a/app/views/global/_header.html.erb b/app/views/global/_header.html.erb
deleted file mode 100644
index 8cb5195..0000000
--- a/app/views/global/_header.html.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-<div id="header">
-  <div id="headerleft">
-    <a id="l_holder" style="background-color: #<%= sprintf("%02x%02x%02x",
-    [ 255, (@traffic * 6).floor + 50.0 ].min, 0, 0) %>;" href="/"></a>
-
-    <% links = { "/" => "Home", "/newest" => "Newest Stories" } %>
-    <% if @user %>
-      <% links.merge!({ "/threads" => "Your Threads",
-        "/stories/new" => "Submit Story" }) %>
-    <% end %>
-    <% links.merge!({ "/search" => "Search" }) %>
-
-    <% if @cur_url.present? && !links.keys.include?(@cur_url) %>
-      <span id="headertitle">
-        <a href="<%= @cur_url %>"><%= @title %></a>
-      </span>
-    <% end %>
-
-    <span class="headerlinks">
-      <% links.each do |u,v| %>
-        <a href="<%= u %>" <%= u == @cur_url ? raw("class=\"cur_url\"") :
-          "" %>><%= v %></a>
-      <% end %>
-    </span>
-  </div>
-
-	<div id="headerright" class="<%= @user ? "loggedin" : "" %>">
-    <span class="headerlinks">
-		<% if @user %>
-      <a href="/filters">Filters</a>
-
-			<% if (count = @user.unread_message_count) > 0 %>
-				<a href="/messages"><%= count %> New Message<%= count == 1 ? "" : "s"
-          %></a>
-			<% else %>
-				<a href="/messages">Messages</a>
-			<% end %>
-
-			<a href="/settings"><%= @user.username %> (<%= @user.karma %>)</a>
-
-			<%= link_to "Logout", { :controller => "login", :action => "logout" },
-				:data => { :confirm => "Are you sure you want to logout?" },
-        :method => "post" %>
-		<% else %>
-			<a href="/login">Login</a>
-		<% end %>
-    </span>
-	</div>
-
-	<div class="clear"></div>
-</div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 788cd22..edfc18d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -24,7 +24,57 @@
 </head>
 <body>
   <div id="wrapper">
-    <%= render :partial => "global/header" %>
+    <div id="header">
+      <div id="headerleft">
+        <a id="l_holder" style="background-color: #<%= sprintf("%02x%02x%02x",
+        [ 255, (@traffic * 7).floor + 50.0 ].min, 0, 0) %>;" href="/"></a>
+
+        <% links = { "/" => "Home", "/newest" => "Newest Stories" } %>
+        <% if @user %>
+          <% links.merge!({ "/threads" => "Your Threads",
+            "/stories/new" => "Submit Story" }) %>
+        <% end %>
+        <% links.merge!({ "/search" => "Search" }) %>
+
+        <% if @cur_url.present? && !links.keys.include?(@cur_url) %>
+          <span id="headertitle">
+            <a href="<%= @cur_url %>"><%= @title %></a>
+          </span>
+        <% end %>
+
+        <span class="headerlinks">
+          <% links.each do |u,v| %>
+            <a href="<%= u %>" <%= u == @cur_url ? raw("class=\"cur_url\"") :
+              "" %>><%= v %></a>
+          <% end %>
+        </span>
+      </div>
+
+      <div id="headerright" class="<%= @user ? "loggedin" : "" %>">
+        <span class="headerlinks">
+        <% if @user %>
+          <a href="/filters">Filters</a>
+
+          <% if (count = @user.unread_message_count) > 0 %>
+            <a href="/messages"><%= count %> New Message<%= count == 1 ?
+              "" : "s" %></a>
+          <% else %>
+            <a href="/messages">Messages</a>
+          <% end %>
+
+          <a href="/settings"><%= @user.username %> (<%= @user.karma %>)</a>
+
+          <%= link_to "Logout", { :controller => "login", :action => "logout" },
+            :data => { :confirm => "Are you sure you want to logout?" },
+            :method => "post" %>
+        <% else %>
+          <a href="/login">Login</a>
+        <% end %>
+        </span>
+      </div>
+
+      <div class="clear"></div>
+    </div>
   
     <div id="inside">
       <% if flash[:error] %>
