diff --git a/footer.php b/footer.php
index fbdc413..0756722 100755
--- a/footer.php
+++ b/footer.php
@@ -16,13 +16,13 @@
 			</div><!-- .site-info -->
 		</footer><!-- #colophon -->
 
-	  </div><!-- .span9 -->
-    </div><!-- .row -->
-  </div><!-- #main -->
-</div><!-- #page -->
+		</div><!-- .span9 -->
+	</div><!-- .row -->
+</div><!-- #main -->
 <?php wp_footer(); ?>
 <!-- Bootstrap WP386 Transitions -->
-<!--<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/jquery.js"></script>
+<!--
+<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/jquery.js"></script>
 <script src="<?php echo get_stylesheet_directory_uri(); ?>/js/bootstrap-386.js"></script>
 <script src="<?php echo get_stylesheet_directory_uri(); ?>/js/bootstrap-transition.js"></script>
 <script>
@@ -31,6 +31,7 @@ _386 = {
   onePass: false,
   speedFactor: 1.5
 };
-</script>-->
+</script>
+-->
 </body>
 </html>
diff --git a/header.php b/header.php
index 858f38c..9508930 100755
--- a/header.php
+++ b/header.php
@@ -22,33 +22,32 @@
 </head>
 
 <body <?php body_class(); ?>>
-<div id="page" class="hfeed site">
-	<?php do_action( 'before' ); ?>
-	<header id="masthead" class="site-header" role="banner">
-		<div class="navbar navbar-inverse navbar-fixed-top">
-			<div class="navbar-inner">
-				<div class="container">
-					<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home" class="brand"><?php bloginfo( 'name' ); ?></a>
-					<div id="site-description"><?php $fortune_file='bofh-excuses'; $fortune_args='-s -n 90'; include '/meta/s/stian/html/inc/fortune.php'; ?></div>
-					<?php $walker = new Bootstrap_Nav_Menu_Walker(); ?>
-					<?php wp_nav_menu( array( 'theme_location' => 'primary', 'container' => false, 'menu_class' => 'nav', 'walker' => $walker, 'fallback_cb' => '' ) ); ?>
-				</div>
+<?php do_action( 'before' ); ?>
+<header id="masthead" class="site-header" role="banner">
+	<div class="navbar navbar-inverse navbar-fixed-top">
+		<div class="navbar-inner">
+			<div class="container">
+				<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home" class="brand"><?php bloginfo( 'name' ); ?></a>
+				<div id="site-description"><?php $fortune_file='bofh-excuses'; $fortune_args='-s -n 90'; include '/meta/s/stian/html/inc/fortune.php'; ?></div>
+				<?php $walker = new Bootstrap_Nav_Menu_Walker(); ?>
+				<?php wp_nav_menu( array( 'theme_location' => 'primary', 'container' => false, 'menu_class' => 'nav', 'walker' => $walker, 'fallback_cb' => '' ) ); ?>
 			</div>
 		</div>
-	</header><!-- #masthead -->
-	<div id="main" class="site-main container">
-		<?php if (is_active_sidebar( 'sidebar-1' )): ?>
-		<div class="row">
-			<div class="span3">
-				<div class="sidebar-affix">
-					<div class="sidebar-outer">
-						<div class="sidebar-container">
-							<?php dynamic_sidebar( 'sidebar-1' ); ?>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="span9">
-			<?php else: ?>
-			<div class="span12">
-			<?php endif; ?>
+	</div>
+</header><!-- #masthead -->
+<div id="main" class="site-main container">
+	<?php if (is_active_sidebar( 'sidebar-1' )): ?>
+	<div class="row">
+		<div class="span3">
+			<div class="sidebar-affix">
+				<div class="sidebar-outer">
+					<div class="sidebar-container">
+						<?php dynamic_sidebar( 'sidebar-1' ); ?>
+					</div><!-- .sidebar-container -->
+				</div><!-- .sidebar-outer -->
+			</div><!-- .sidebar-affix -->
+		</div><!-- .span3 -->
+		<div class="span9">
+		<?php else: ?>
+		<div class="span12">
+		<?php endif; ?>
