diff --git a/css/layout.css b/css/layout.css
index ae907fc..0ba852e 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -35,53 +35,6 @@ a:link {
     -webkit-tap-highlight-color: #b80000
 }
 
-.content img.left, .content img.right {
-    border: 5px solid #d7d7d7;
-    max-width: 60%;
-    height: auto;
-}
-.content img.left {
-	float: left;
-  margin: 6px 20px 10px 0;
-}
-content img.right {
-	float: right;
-  margin: 6px 0 10px 20px;
-}
-
-.content ul {
-    margin: 20px 0 20px 30px
-}
-.content li {
-    line-height: 22px;
-    margin-bottom: 5px;
-    list-style-type: disc;
-}
-.content-container h1 {
-    font-size: 36px;
-    border-bottom: 1px solid #e5e5e5;
-    padding-bottom: 6px;
-    margin: 0 0 23px 0;
-    line-height: 45px;
-}
-	.content-container h1 span.amp {
-	    font-family: Baskerville,"Goudy Old Style","Palatino","Book Antiqua",Georgia;
-	    font-style: italic;
-	}
-.content-container h2 {
-    font-size: 24px;
-    margin-bottom: 15px;
-    padding-top: 15px;
-    line-height: 32px;
-}
-.content-container h3 {
-    font-size: 21px;
-    margin-bottom: 10px;
-    padding-top: 10px;
-}
-.content a {
-    border-bottom: 1px dashed #b80000
-}
 .brand {
     float: left;
     display: inline-block;
@@ -612,13 +565,13 @@ aside {
 	aside {
 	    width: 100%
 	}
-		.content-container h1 {
+		.typography h1 {
 		    font-size: 30px;
 			 line-height:35px;
 		    margin-bottom: 15px;
 		    padding-bottom: 10px;
 		}
-		.content-container p {
+		.typography p {
 		    font-size: 14px;
 		    line-height: 23px;
 		}
diff --git a/css/typography.css b/css/typography.css
index 01a0967..13e1d62 100644
--- a/css/typography.css
+++ b/css/typography.css
@@ -42,6 +42,46 @@ a {
 a:hover {
     color: #d80000
 }
+
+.typography h1 a{
+  border:none;
+}
+
+.typography ul {
+    margin: 20px 0 20px 30px
+}
+.typography li {
+    line-height: 22px;
+    margin-bottom: 5px;
+    list-style-type: disc;
+}
+.typography h1 {
+    font-size: 36px;
+    border-bottom: 1px solid #e5e5e5;
+    padding-bottom: 6px;
+    margin: 0 0 23px 0;
+    line-height: 45px;
+}
+	.typography h1 span.amp {
+	    font-family: Baskerville,"Goudy Old Style","Palatino","Book Antiqua",Georgia;
+	    font-style: italic;
+	}
+.typography h2 {
+    font-size: 24px;
+    margin-bottom: 15px;
+    padding-top: 15px;
+    line-height: 32px;
+}
+.typography h3 {
+    font-size: 21px;
+    margin-bottom: 10px;
+    padding-top: 10px;
+}
+.typography a {
+    border-bottom: 1px dashed #b80000
+}
+
+
 table {
     border-collapse: collapse;
     border: 1px solid #d4d4d4;
@@ -87,15 +127,26 @@ p.intro {
 /* IMAGES 
 -------------------------------------------- */
 .typography img {
-    border: none
+    border: 5px solid #d7d7d7;
+    max-width: 60%;
+    height: auto;
+    float: left;
+    margin: 6px 20px 10px 0;
+}
+.typography img.left, .typography img.right {
+    border: 5px solid #d7d7d7;
+    max-width: 60%;
+    height: auto;
+}
+.typography img.left {
+    float: left;
+    margin: 6px 20px 10px 0;
 }
 .typography img.right {
     float: right;
-    margin-left: 20px;
-}
-.typography img.left {
-    float: left
+    margin: 6px 0 10px 20px;
 }
+
 .typography img.leftAlone {
     float: left;
     margin-right: 100%;
@@ -105,4 +156,6 @@ p.intro {
     margin-left: auto;
     margin-right: auto;
     display: block;
-}
\ No newline at end of file
+}
+
+
diff --git a/templates/Layout/Page.ss b/templates/Layout/Page.ss
index 4263761..848e75b 100644
--- a/templates/Layout/Page.ss
+++ b/templates/Layout/Page.ss
@@ -1,4 +1,4 @@
-<div class="content-container typography">	
+<div class="content-container">	
 	<article>
 		<h1>$Title</h1>
 		<div class="content">$Content</div>
diff --git a/templates/Layout/Page_results.ss b/templates/Layout/Page_results.ss
index 73f0b09..8a0b176 100644
--- a/templates/Layout/Page_results.ss
+++ b/templates/Layout/Page_results.ss
@@ -1,4 +1,4 @@
-<div id="Content" class="searchResults typography">
+<div id="Content" class="searchResults">
     <h1>$Title</h1>
      
     <% if Query %>
diff --git a/templates/Page.ss b/templates/Page.ss
index df8f1d4..a9d3028 100644
--- a/templates/Page.ss
+++ b/templates/Page.ss
@@ -31,7 +31,7 @@ Change it, enhance it and most importantly enjoy it!
 <body class="$ClassName<% if Menu(2) %><% else %> no-sidebar<% end_if %>">
 <% include Header %>
 <div class="main" role="main">
-	<div class="inner">
+	<div class="inner typography">
 		$Layout
 	</div>
 </div>