diff --git a/wp-content/themes/gf2013/content.php b/wp-content/themes/gf2013/content.php
index 293b2a3..4feb3d1 100644
--- a/wp-content/themes/gf2013/content.php
+++ b/wp-content/themes/gf2013/content.php
@@ -12,7 +12,6 @@
 		</div>
 		<?php endif; ?>
 		<header class="entry-header">
-			<?php the_post_thumbnail(); ?>
 			<?php if ( is_single() ) : ?>
 			<h1 class="entry-title"><?php the_title(); ?></h1>
 			<?php else : ?>
@@ -33,7 +32,7 @@
 			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'gf2013' ), 'after' => '</div>' ) ); ?>
             </li>
             <li>
-bu
+                <?php the_post_thumbnail(); ?>
             </li>
 		</ul><!-- .entry-content -->
 		<?php endif; ?>
diff --git a/wp-content/themes/gf2013/functions.php b/wp-content/themes/gf2013/functions.php
index d67104a..c182c4c 100644
--- a/wp-content/themes/gf2013/functions.php
+++ b/wp-content/themes/gf2013/functions.php
@@ -3,4 +3,5 @@ function register_my_menu() {
     register_nav_menu('primary-menu', __( 'Menu' ));
 }
 add_action( 'init', 'register_my_menu' );
+add_theme_support( 'post-thumbnails' );
 ?>
diff --git a/wp-content/themes/gf2013/images/landingbilde.jpg b/wp-content/themes/gf2013/images/landingbilde.jpg
index 96f1629..c235e40 100644
Binary files a/wp-content/themes/gf2013/images/landingbilde.jpg and b/wp-content/themes/gf2013/images/landingbilde.jpg differ
diff --git a/wp-content/themes/gf2013/sass/app.scss b/wp-content/themes/gf2013/sass/app.scss
index cfe63ed..591915c 100644
--- a/wp-content/themes/gf2013/sass/app.scss
+++ b/wp-content/themes/gf2013/sass/app.scss
@@ -1,5 +1,6 @@
 // Global Foundation Settings
 @import "settings";
+@import "compass/css3";
 
 // Comment out this import if you are customizing you imports below
 @import "foundation";
@@ -65,17 +66,14 @@ body,html {
     height: 100%;
 }
 #masthead {
-    /* hacky */
-    position: relative;
-    right: 1.6em;
-    width: 112%;
-    background-color: $body-bg;
+    background-color: $grey;
+    @include border-radius(2px);
 }
 #page {
-    margin-top: 50px;
-    background-color: $grey;
+    margin-top: 2.7em;
 
     .site-title {
+        background-color: $body-bg;
         font-family: $headerfont;
         font-size: 2em;
         font-weight: normal;
@@ -100,10 +98,11 @@ body,html {
 .nav-wrapper {
     height: 100%;
     background-color: $grey;
+    @include border-radius(2px);
     text-align: center;
 
     .date-mark {
-        margin-top: 50px;
+        margin-top: 2em;
 
         img {
             margin: 0.7em auto;
@@ -159,6 +158,9 @@ body,html {
                     width: 50%;
                     background-color: $primary-color;
                     color: white;
+                    @include border-radius(2px);
+                    @include box-shadow(darken($grey, 10%), 2px 2px 10px);
+                    @include text-shadow(darken($primary-color, 20%) 1px 1px 0);
                 }
             }
         }
@@ -169,8 +171,10 @@ body,html {
 }
 #content {
     .page {
-        padding-bottom: 1em;
-        padding-top: 1em;
+        background-color: $grey;
+        padding: 1em;
+        @include border-radius(2px);
+
         .entry-content ul{
             padding-left: 20px;
         }
@@ -188,10 +192,10 @@ body,html {
     }
 }
 .home #page {
-    padding-left: 0;
-    padding-right: 0;
     background-image: url("../images/landingbilde.jpg");
-    min-height: 676px;
+    background-position: 1.5625em;
+    background-repeat: no-repeat;
+    min-height: 619px;
 }
 .front-page-caption {
     position: absolute;
@@ -203,7 +207,9 @@ body,html {
     padding-right: 1.5625em; 
     min-height: 100px;
 }
+#masthead {
+    padding-top: 0.3em; 
+}
 .home #masthead {
-    padding-left: 1.5625em; 
-    padding-right: 1.5625em; 
+    padding-top: 0;
 }
diff --git a/wp-content/themes/gf2013/stylesheets/app.css b/wp-content/themes/gf2013/stylesheets/app.css
index b88baca..57fd94f 100644
--- a/wp-content/themes/gf2013/stylesheets/app.css
+++ b/wp-content/themes/gf2013/stylesheets/app.css
@@ -4702,18 +4702,19 @@ body h1, body h2, body h3, html h1, html h2, html h3 {
 }
 
 #masthead {
-  /* hacky */
-  position: relative;
-  right: 1.6em;
-  width: 112%;
-  background-color: #e7e8ea;
+  background-color: #2d2b29;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
 }
 
 #page {
-  margin-top: 50px;
-  background-color: #2d2b29;
+  margin-top: 2.7em;
 }
 #page .site-title {
+  background-color: #e7e8ea;
   font-family: "Julius Sans One";
   font-size: 2em;
   font-weight: normal;
@@ -4735,10 +4736,15 @@ body h1, body h2, body h3, html h1, html h2, html h3 {
 .nav-wrapper {
   height: 100%;
   background-color: #2d2b29;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
   text-align: center;
 }
 .nav-wrapper .date-mark {
-  margin-top: 50px;
+  margin-top: 2em;
 }
 .nav-wrapper .date-mark img {
   margin: 0.7em auto;
@@ -4790,11 +4796,25 @@ body h1, body h2, body h3, html h1, html h2, html h3 {
   width: 50%;
   background-color: #e1842e;
   color: white;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
+  -webkit-box-shadow: #121211, 2px 2px 10px;
+  -moz-box-shadow: #121211, 2px 2px 10px;
+  box-shadow: #121211, 2px 2px 10px;
+  text-shadow: #945215 1px 1px 0;
 }
 
 #content .page {
-  padding-bottom: 1em;
-  padding-top: 1em;
+  background-color: #2d2b29;
+  padding: 1em;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
 }
 #content .page .entry-content ul {
   padding-left: 20px;
@@ -4812,10 +4832,10 @@ body h1, body h2, body h3, html h1, html h2, html h3 {
 }
 
 .home #page {
-  padding-left: 0;
-  padding-right: 0;
   background-image: url("../images/landingbilde.jpg");
-  min-height: 676px;
+  background-position: 1.5625em;
+  background-repeat: no-repeat;
+  min-height: 619px;
 }
 
 .front-page-caption {
@@ -4829,7 +4849,10 @@ body h1, body h2, body h3, html h1, html h2, html h3 {
   min-height: 100px;
 }
 
+#masthead {
+  padding-top: 0.3em;
+}
+
 .home #masthead {
-  padding-left: 1.5625em;
-  padding-right: 1.5625em;
+  padding-top: 0;
 }