diff --git a/layouts/404.html b/layouts/404.html
index d5b27a6..06246e4 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -2,7 +2,7 @@
 	<body>
     {{ partial "nav.html" . }}
 
-    <section id="wrapper" class="home">
+    <section class="wrapper home">
         <article class="post">
             <header>
                 <h1>{{ with .Site.Params.title404 }}{{ . }}{{ else }}404 - Page not found{{ end }}</h1>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 860a629..5539d55 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,7 +3,7 @@
 	{{ partial "nav.html" . }}
 	{{ partial "profile.html" . }}
 
-	<section id="wrapper" class="home">
+	<section class="wrapper home">
 		{{ range .Data.Pages.GroupByDate "2006" }}
 		<div class="archive">
 			<h3>{{ .Key }}</h3>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 6dbb01a..b274288 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -2,7 +2,7 @@
     <body>
        {{ partial "nav.html" . }}
 
-        <section id="wrapper">
+        <section class="wrapper">
             <article class="post">
                 <header>
                     <h1>
diff --git a/layouts/about/single.html b/layouts/about/single.html
index 4933005..6e131de 100644
--- a/layouts/about/single.html
+++ b/layouts/about/single.html
@@ -3,7 +3,7 @@
 {{ partial "nav.html" . }}
 {{ partial "profile.html" . }}
 
-<section id="wrapper" class="home">
+<section class="wrapper home">
     {{ .Content }}
 
     {{ if .Site.Params.enableDisqus }}
diff --git a/layouts/index.html b/layouts/index.html
index 74411da..273b5a9 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -4,7 +4,7 @@
 
     {{ partial "profile.html" . }}
 
-    <section id="wrapper" class="home">
+    <section class="wrapper home">
         {{ partial "post-list.html"  . }}
         {{ partial "pagination.html" . }}
         {{ partial "footer.html"     . }}
diff --git a/layouts/partials/profile.html b/layouts/partials/profile.html
index d58f285..ec80961 100644
--- a/layouts/partials/profile.html
+++ b/layouts/partials/profile.html
@@ -1,11 +1,9 @@
-<div class="profile">
-    <section id="wrapper">
-        <header id="header">
-            <a href='{{ .Site.BaseURL }}about'>
-                <img id="avatar" class="2x" src="{{ .Site.BaseURL }}images/avatar.png"/>
-            </a>
-            <h1>{{ .Site.Params.name }}</h1>
-            <h2>{{ .Site.Params.bio | markdownify }}</h2>
-        </header>
-    </section>
-</div>
\ No newline at end of file
+<section class="wrapper profile">
+  <header id="header">
+      <a href='{{ .Site.BaseURL }}about'>
+          <img id="avatar" class="2x" src="{{ .Site.BaseURL }}images/avatar.png"/>
+      </a>
+      <h1>{{ .Site.Params.name }}</h1>
+      <h2>{{ .Site.Params.bio | markdownify }}</h2>
+  </header>
+</section>
diff --git a/layouts/tags/single.html b/layouts/tags/single.html
index d03d7a0..a16f3d4 100644
--- a/layouts/tags/single.html
+++ b/layouts/tags/single.html
@@ -3,7 +3,7 @@
        {{ partial "nav.html" . }}
        {{ partial "profile.html" . }}
 
-        <section id="wrapper" class="tags">
+        <section class="wrapper tags">
             <div class="page-tags" id="tags">
                 {{ range $name, $taxonomy := .Site.Taxonomies.tags }}
                  <span class="tags">
diff --git a/static/css/style.css b/static/css/style.css
index 8de4f4f..06aa687 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -134,7 +134,7 @@ h2 {
     color: #bbb;
 }
 
-.profile #wrapper {
+.wrapper.profile {
     padding: 100px 40px 0px;
     max-width: 600px;
     margin: 0 auto;
@@ -200,13 +200,13 @@ nav.main-nav a.cta {
     margin-left: 12px;
 }
 
-#wrapper {
+.wrapper {
     max-width: 600px;
     margin: 0 auto;
     padding: 60px 40px 100px 40px;
 }
 
-#wrapper.home {
+.wrapper.home {
     max-width: 600px;
     margin: 0 auto;
     padding: 0px 40px 20px 40px;
@@ -747,7 +747,7 @@ h2.month {
 /* Media Queries */
 
 @media screen and (max-width: 540px) {
-    #wrapper {
+    .wrapper {
         padding: 20px 20px 20px 20px;
     }
     #header {
@@ -871,7 +871,7 @@ code {
  * tags page
  */
 
-#wrapper.tags {
+.wrapper.tags {
   padding: 0px 40px 20px 40px;
 }
 .page-tags {
