diff --git a/_layouts/core.html b/_layouts/core.html
index 21ae65d..566597a 100644
--- a/_layouts/core.html
+++ b/_layouts/core.html
@@ -12,32 +12,38 @@
    <!-- Le fav and touch icons -->
    <link rel="shortcut icon" href="/favicon.ico">
 
-{% for style in page.styles %}
+<!-- {% for style in page.styles %}
    <link rel="stylesheet" href="{{ style }}" type="text/css" />
-{% endfor %}
+{% endfor %} -->
    <script type="text/javascript" src="/js/jquery-1.10.2.min.js"></script>
    <script type="text/javascript" src="/js/raphael-2.1.0.min.js"></script>
    <script type="text/javascript" src="/js/kartograph.js"></script>
 
 </head>
 <body>
-   <div class="span6 offset3">
-      <center><a href="/"><img src="images/logo-white.svg" width="100%"/></a></center>
+   <div id="wrap">
+      <div class="container">
+         <div class="row">
+            <div class="span8 offset2" style="margin-bottom: 1rem;">
+               <center><a href="/"><img src="images/logo-white.svg" width="100%"/></a></center>
+            </div>
+         </div>
+
+         {{ content }}
+      </div>
    </div>
 
-	{{ content }}
-
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.kartograph.org/" : "http://piwik.kartograph.org/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="http://piwik.kartograph.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Tracking Code -->
+   <!-- Piwik -->
+   <script type="text/javascript">
+   var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.kartograph.org/" : "http://piwik.kartograph.org/");
+   document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+   </script><script type="text/javascript">
+   try {
+   var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
+   piwikTracker.trackPageView();
+   piwikTracker.enableLinkTracking();
+   } catch( err ) {}
+   </script><noscript><p><img src="http://piwik.kartograph.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
+   <!-- End Piwik Tracking Code -->
 </body>
 </html>
diff --git a/_layouts/text.html b/_layouts/text.html
index abcbef1..0c12ead 100644
--- a/_layouts/text.html
+++ b/_layouts/text.html
@@ -9,14 +9,13 @@ layout: core
 			</div>
 		</div>
 		<div class="row">
-
-			<div class="span6 offset3">
+			<div class="span8 offset2">
 				{% if page.headline %}
 				<div class="hero-unit"{% if page.headbg %} style="background:url({{page.headbg}})" {% endif %}>
    					<h1>{{ page.headline }}</h1>
 				</div>
 				{% endif %}
-				<div class="content{% if page.class %} {{ page.class }}{% endif %}">
+				<div class="content">
 					{{ content }}
 				</div>
 				<div class="footer">
diff --git a/_layouts/twentyone.html b/_layouts/twentyone.html
deleted file mode 100644
index 500c89d..0000000
--- a/_layouts/twentyone.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-layout: default
----
-
-	<center><a href="/"><img src="images/logo-white.svg"/></a></center>
-
-	{{ content }}
diff --git a/index.html b/index.html
index 7bba43f..0583d51 100644
--- a/index.html
+++ b/index.html
@@ -1,5 +1,5 @@
 ---
-layout: twentyone
+layout: default 
 title: Twentyone.World
 ---
 
