Index: applications/mobileblur/static/css/base.css
==================================================================
--- applications/mobileblur/static/css/base.css
+++ applications/mobileblur/static/css/base.css
@@ -514,17 +514,22 @@
   p, h2, h3 { orphans: 3; widows: 3; }
   h2, h3{ page-break-after: avoid; }
 }
 
 body {
-/*    background-color: #f2c84b;*/
     color: #493F3E
 }
+#content {
+    padding: 0 0.5% 0 0.5%;
+}
+
+a, a:hover {
+    text-decoration: none;
+}
 
 header {
     background-color: #95392E;
-    padding: 1%;
     border-bottom: 1px solid #95392E;
     color: white;
 }
 header > h1 > a {
     text-decoration: none;
@@ -534,37 +539,49 @@
 
 #story > header > a {
     color: white;
 }
 
-header > a> h2 {
+header h2 {
 /*    border-top: 1px solid white;*/
     color: white;
 }
 
 #story-list {
 /*    background-color: #f2c84b;*/
 }
 
-#story-list > .story > a, .feed > a {
-    text-decoration: none;
+#story-list a, .feed {
+    padding: 0.5% 0 0.5% 0;
     font-weight: bold;
     margin-top: 0;
 }
-#story-list > .story > p {
+
+.story-date {
     font-size: .75em;
+    color: #493F3E;
+    font-weight: normal;
+}
+
+.feed {
+    color: white;
+    text-decoration: none;
 }
 
-#story-list > .story > .read {
+.read {
     color: #D99B48;
 }
-#story-list > .story > .unread, .feed > a {
+.unread, .feed .feed-title {
     color: #C57E3C;
 }
+.ng, .nt, .ps {
+    color: #493F3E;
+}
 
-#story-list > .story, .feed {
-    padding: .5%;
+#story-list .story, .feed {
+    text-decoration: none;
+    padding: .5 0 .5% 0%;
     border-top: 1px solid #95392E;
     margin-top: .33%;
 }
 
 span.ps, span.nt, span.ng {
@@ -581,14 +598,13 @@
     background-color: red;
 }
 
 footer {
     background-color: #95392E;
-    padding: 1%;
     border-top: 1px solid #95392E;
     color: white;
 }
-footer > a {
+footer a {
     text-decoration: none;
     color: white;
     font-weight: bold;
 }

Index: applications/mobileblur/views/default/index.html
==================================================================
--- applications/mobileblur/views/default/index.html
+++ applications/mobileblur/views/default/index.html
@@ -1,10 +1,12 @@
 {{extend 'layout.html'}}
 
 {{ for feed in feeds.itervalues(): }}
-    <div class="feed">
-        {{ if threshold == -1 and feed["ng"] > 0: }} <span class='ng'>{{= feed["ng"] }}</span> {{ pass }}
-        {{ if threshold <= 0 and feed["nt"] > 0: }} <span class='nt'>{{= feed["nt"] }}</span> {{ pass }}
-        {{if feed["ps"] > 0: }}<span class='ps'>{{= feed["ps"] }}</span> {{ pass }}
-        <a href="{{= URL(c="feeds", f="view", args=[feed["id"]]) }}">{{= feed["feed_title"] }}</a><br />
-    </div>
+    <a href="{{= URL(c="feeds", f="view", args=[feed["id"]]) }}">
+        <div class="feed">
+            {{ if threshold == -1 and feed["ng"] > 0: }} <span class='ng'>{{= feed["ng"] }}</span> {{ pass }}
+            {{ if threshold <= 0 and feed["nt"] > 0: }} <span class='nt'>{{= feed["nt"] }}</span> {{ pass }}
+            {{if feed["ps"] > 0: }}<span class='ps'>{{= feed["ps"] }}</span> {{ pass }}
+            <span class="feed-title">{{= feed["feed_title"] }}</span>
+        </div>
+    </a>
 {{ pass }}

Index: applications/mobileblur/views/feeds/view.html
==================================================================
--- applications/mobileblur/views/feeds/view.html
+++ applications/mobileblur/views/feeds/view.html
@@ -4,25 +4,19 @@
     <h2>{{= feed["feed_title"] }}</h2>
     <a href="{{= URL("mark_read", args=[feed["id"]]) }}" class="button">Mark feed as read</a>
 {{ end }}
 
 <section id="story-list">
-{{
-import time 
-s = time.time()
-}}
     {{ 
         for story in stories: 
         if sum([v for k,v in story["intelligence"].iteritems()]) < threshold:
             continue
     }}
 
-        {{ print story["read_status"] }}
-        <div class="story">
-            <a href="{{= URL(c="stories", f="view", vars=dict(story=story["id"], feed_id=feed["id"])) }}" class="{{= "unread" if story["read_status"] == 0 else "read" }}">
-                {{= story["story_title"] }}
-            </a>
-            <p>{{= story["story_date"] }}</p>
-        </div>
+        <a href="{{= URL(c="stories", f="view", vars=dict(story=story["id"], feed_id=feed["id"])) }}" }}">
+            <div class="story">
+                <p class="story-title {{= "unread" if story["read_status"] == 0 else "read" }}">{{= story["story_title"] }}</p>
+                <p class="story-date">{{= story["story_date"] }}</p>
+            </div>
+        </a>
     {{ pass }}
-{{ print time.time() - s }}
 </section>

Index: applications/mobileblur/views/layout.html
==================================================================
--- applications/mobileblur/views/layout.html
+++ applications/mobileblur/views/layout.html
@@ -57,12 +57,10 @@
     else: left_sidebar_style = 'style="display: none;"'
     if right_sidebar_enabled: right_sidebar_style = 'style="display: block;"'
     else: right_sidebar_style = 'style="display: none;"'
     style_content = 'style="width: %s"' % width_content
     }}
-<!--    <link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css">-->
-    <link rel="stylesheet" href="{{= URL("static", "css/1140.css") }}">
   </head>
   
   <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->	
   <!--[if lt IE 7 ]> <body class="ie6"> <![endif]-->
   <!--[if IE 7 ]>    <body class="ie7"> <![endif]-->
@@ -77,11 +75,11 @@
           <h1><a href="{{= URL("mobileblur", "default", "index") }}">MobileBlur</a></h1>
 	  {{end}}
       {{ block header_bonus }}{{end}}
 	</header>
 	
-    <section id="content" class-"container" {{=XML(style_content)}} >
+    <section id="content"{{=XML(style_content)}} >
         {{include}}	
     </section>
 
     <footer>
         <a href="{{= URL("default", "logout") }}">Log out</a>