diff --git a/style.css b/style.css
index 5930ddb..dcc3fa5 100755
--- a/style.css
+++ b/style.css
@@ -1,6 +1,5 @@
-
 body{
-  background: #FFF url(images/header-background.png) repeat-x;	
+  background: #FFF url(images/header-background.png) repeat-x;
   margin:0;
 }
 body.toolbar {
@@ -18,8 +17,8 @@ body.toolbar-drawer {
   line-height: 1.333em; /* 12px x 1.333 = 16px */
 }
 
-/* 
- * Override generic html 
+/*
+ * Override generic html
 */
 
 a {
@@ -40,8 +39,8 @@ input.form-text{
   padding:3px;
 }
 
-/* 
- * Override drupal system.css 
+/*
+ * Override drupal system.css
 */
 
 .item-list ul li {
@@ -56,8 +55,7 @@ ul.links {
   padding:0;
 }
 
-
-/* 
+/*
  * Reusable classes
 */
 
@@ -67,17 +65,13 @@ ul.links {
 .right{float:right;}
 .none{float:none;}
 
-
 /* end generic; all sap elements must have margin-left and with defined */
 
-
 #title {
-  /*margin-left: -80%;*/
   width: 65%;
 }
 
-
-/* 
+/*
  *  Layout
 */
 
@@ -97,18 +91,13 @@ ul.links {
   color: #444;
   background-color:#fff;
   float:left;
-  width: 570px;/*500px;*/
+  width: 570px;
   margin: 20px 0 0 20px;
   padding: 10px 20px;
 }
 
-/*.no-sidebars #main #main-content {
-	width: 770px;
-}*/
-
 #main {
-  /*margin-left: -100%;*/
-  width: 960px;/*850px;*/
+  width: 960px;
   clear:both;
   overflow: auto;
   margin: 0 auto;
@@ -116,7 +105,6 @@ ul.links {
 }
 
 #main #sidebar-right {
-  /*margin-left:  -150px;*/
   width: 200px;
   float: right;
 }
@@ -124,34 +112,25 @@ ul.links {
 #header{
   overflow:hidden;/*auto;*/
   margin:0 auto;
-  /*width: 850px;817px;*/
   padding:0;
   height: 140px;
-  background: url(images/header-curve.png) no-repeat right top;	
+  background: url(images/header-curve.png) no-repeat right top;
 }
 
-/* 
+/*
  *  Blocks
 */
 
 #sidebar-left div.block {
-  /*border-right: 4px solid #333;1px dotted #CCC;*/
-  /*background-color:#f8f8f8;*/
   padding:10px;
-  /*margin-top:15px;*/
   clear: both;
 }
 
-/*#blocks-wrapper{
-	background: transparent url(images/side.png) repeat-y right center;
-}*/
-
-/* 
+/*
  *  Footer
 */
 
 #footer {
-  /*margin-left: -100%;*/
   width: 100%;
   background-color: #efefef;
   color: #999;
@@ -163,14 +142,16 @@ ul.links {
 }
 #footer-right{
   background: url(images/footer-right2.png) no-repeat right bottom;
-  height: 327px; 
+  height: 327px;
 }
 #footer-left{
   background: url(images/footer-left.png) no-repeat left bottom;
   height: 327px;
  overflow: hidden;
 }
-.block-region{clear:both;}
+.block-region{
+  clear:both;
+}
 
 #main-content .node{
   border-bottom:1px solid #EFEFEF;
@@ -178,12 +159,8 @@ ul.links {
   padding:0 0 30px;
 }
 
-
-
-
 /********* Primary Navigation *****/
 
-
 #navigation {
   text-align: center;
   font-size: 150%;
@@ -212,10 +189,7 @@ ul.primary-links{
 #navigation a:hover{
   background: transparent url(images/trans.png) repeat;
 }
-#navigation a.active{/*font-weight:bold;*/}
-#navigation li.last a/* primary-nav links */
-  {
-  }
+
 
 
 
@@ -228,7 +202,7 @@ ul.primary-links{
   margin: 8px 0 0 30px;
 }
 
-h1#site-name a{	
+h1#site-name a{
   font-family: "Century Gothic", Helvetica, "Bitstream Vera Sans", sans-serif;
   font-size: 2em;
   font-weight: normal;
@@ -237,7 +211,7 @@ h1#site-name a{
 }
 
 h1.title{
-  font-size: 1.6em; 
+  font-size: 1.6em;
   color: #272727; /*margin-top:-15px;*/
 }
 
@@ -255,7 +229,6 @@ h1#site-name{
   padding: 34px 0 0 34px;
 }
 
-
 h2#slogan{
   color: #99cc33;
   margin:27px 0 0 5px;
@@ -267,16 +240,15 @@ h2.teaser-title {
   line-height: 1.6em;
 }
 h2.teaser-title a {
-	color: #000;
+  color: #000;
 }
 
-
 /***** error messages ****/
 div.error, div.messages,  div.status{
   background: #E5E7F2 url(images/lightbulb.png) no-repeat 0% 50%;
   padding: 15px 15px 15px 60px;
   border: 1px solid #191970;
-  margin: 0 0 10px 0;	
+  margin: 0 0 10px 0;
 }
 div.tabs{padding: 10px 0 0 0;}
 
@@ -287,156 +259,119 @@ div.tabs{padding: 10px 0 0 0;}
   text-transform: uppercase;
   font-size: 1.2em;
 }
-.block .menu li a {
-  /*background:#dbde97 url(images/arrow.png) no-repeat scroll 95% 50%;
-  display:block;
-  height:22px;
-  padding:6px 15px 0 19px;
-  width:157px;/*191px;*/
-  /*color: #000;
-  font-size: .9em;
-  border-bottom: 1px solid #f7fae9;*/
-}
-.block .menu li a:hover, .block .menu li a.active {
-  /*background:#748d00 url(images/arrow-active.png) no-repeat scroll 95% 50%;
-  color: #FFF;
-  /*display:block;
-  height:28px;
-  padding:8px 15px 0 5px;
-  width:171px;/*191px;*/
-}
 
 .block .menu li, .block ul.menu{
-	list-style: none;
+  list-style: none;
 }
 
-
-.block .menu li{
-	/*margin: 0;*/
-}
-
-
 /*    content styling */
 
 #main-content .content ul li{
-	list-style:none;
-	background:url(images/bullet.png) no-repeat 0 0.4em;
-	padding: 0 0 .2em 1.5em;
-	font-weight: bold;
-	font-family: Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
+  list-style:none;
+  background:url(images/bullet.png) no-repeat 0 0.4em;
+  padding: 0 0 .2em 1.5em;
+  font-weight: bold;
+  font-family: Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
 }
 #main-content .content ul li a{color: #531a1b;}
 #front #main-content .content ul li{
-	background:url(images/bullet.png) no-repeat 0 0.8em;
+  background:url(images/bullet.png) no-repeat 0 0.8em;
 }
 #main-content .content ul{
-	margin:1.5em 0;
-	padding-left:2.5em;
+  margin:1.5em 0;
+  padding-left:2.5em;
 }
 
-
-
-
 div.terms{
-	margin: 15px 0;
+  margin: 15px 0;
 }
 
-
-
-
 /*     front    */
 
-
-.view-data-node-data-field-image-cache-field-image-cache-fid{background: url(images/top-round.gif) no-repeat 0 50;}
-ul.front a{color:#531a1b; font-weight: bold; text-decoration: underline; font-size: 1.2em; text-transform: uppercase;}
-
+.view-data-node-data-field-image-cache-field-image-cache-fid {
+  background: url(images/top-round.gif) no-repeat 0 50;
+}
+ul.front a {
+  color:#531a1b;
+  font-weight: bold;
+  text-decoration: underline;
+  font-size: 1.2em;
+  text-transform: uppercase;
+}
 
 ul.front {
-	background: url(images/pinecone.jpg) no-repeat bottom right;
-	height: 260px;
-	line-height: 2.1em;
-	margin-top:30px;
+  background: url(images/pinecone.jpg) no-repeat bottom right;
+  height: 260px;
+  line-height: 2.1em;
+  margin-top:30px;
 }
 
 input#edit-search-theme-form-keys {
-	border: 1px solid #b9bcab;
+  border: 1px solid #b9bcab;
 }
 #search-block-form input#edit-submit, #search-block-form .form-item{
-	margin: 3px 0 0 5px;
-	float:left;
+  margin: 3px 0 0 5px;
+  float:left;
 }
 
-
-
-
-
-
 /*  posts   */
 
-
 .node .post-date{
-	padding: 0 0 20px 0;
+  padding: 0 0 20px 0;
 }
 
-/***** sidebar *****/
-
-
-
-
-
 /************************************************
-*	Comments									*
+*  Comments                  *
 ************************************************/
-	
+
 #commentblock {
-	width: 450px;
-	background: #E8E8E8;
-	color: #000000;
-	float: left;
-	padding: 20px 20px 10px 20px;
-	margin: 10px 0px 0px 0px;
-	border-top: 2px solid #000000;
-	border-bottom: 1px solid #000000;
-	}
-	
+  width: 450px;
+  background: #E8E8E8;
+  color: #000000;
+  float: left;
+  padding: 20px 20px 10px 20px;
+  margin: 10px 0px 0px 0px;
+  border-top: 2px solid #000000;
+  border-bottom: 1px solid #000000;
+  }
+
 #commentblock ol{
-	list-style-type: square;
-	margin: 0px 0px 0px 0px;
-	padding: 0px 0px 10px 0px;
-	}
-	
+  list-style-type: square;
+  margin: 0px 0px 0px 0px;
+  padding: 0px 0px 10px 0px;
+  }
+
 .commentdate {
-	font-size: 12px;
-	padding-left: 0px;
-	}
-	
+  font-size: 12px;
+  padding-left: 0px;
+  }
+
 #commentlist li p{
-	margin-bottom: 8px;
-	line-height: 20px;
-	padding: 0px;
-	}
+  margin-bottom: 8px;
+  line-height: 20px;
+  padding: 0px;
+  }
 
 .commentname {
-	color: #333333;
-	margin: 0px;
-	padding: 5px 5px 5px 0px;
-	}
+  color: #333333;
+  margin: 0px;
+  padding: 5px 5px 5px 0px;
+  }
 
 .commentinfo{
-	clear: both;
-	}
+  clear: both;
+  }
 
 .commenttext {
-	clear: both;
-	margin: 3px 0px 20px 0px;
-	padding: 20px 10px 5px 10px;
-	width: 390px;
-	background: #E8E8E8 url(images/comment.gif) no-repeat top;
-	-moz-border-radius-bottomleft:10px;
-	-moz-border-radius-bottomright:10px;
-	-webkit-border-radius: 10px;
-	
-	}
+  clear: both;
+  margin: 3px 0px 20px 0px;
+  padding: 20px 10px 5px 10px;
+  width: 390px;
+  background: #E8E8E8 url(images/comment.gif) no-repeat top;
+  -moz-border-radius-bottomleft:10px;
+  -moz-border-radius-bottomright:10px;
+  -webkit-border-radius: 10px;
+  }
 
 .commenttext-admin {
   clear: both;
@@ -468,7 +403,7 @@ input#edit-search-theme-form-keys {
 #commentsform form textarea{
   width: 99%;
 }
-	
+
 p.comments_link  img{
   margin: 0px;
   padding: 0px;
@@ -478,7 +413,6 @@ p.comments_link  img{
   border-left-style: none;
 }
 
-
 /***** GATEWAY *****/
 
 #footer .block{
@@ -501,79 +435,75 @@ p{line-height: 2em;}
 }
 
 .views-field-field-preview-fid{
-	float:left;
+  float:left;
 }
 
 #block-views-events-block_1 .views-field-title, #block-views-events2-block_1 .views-field-title, #block-views-events-block_3 .views-field-title{
-	margin: 0 0 0 80px;
+  margin: 0 0 0 80px;
 }
 
 #block-views-events-block_1 .views-field-created, #block-views-events2-block_1 .views-field-created, #block-views-events-block_3 .views-field-created{
-	margin: 0 0 0 80px;
+  margin: 0 0 0 80px;
 }
 
 #block-views-events-block_1 .views-field-teaser, #block-views-events2-block_1 .views-field-teaser, #block-views-events-block_3 .views-field-teaser{
-	margin: 0 0 0 80px;
+  margin: 0 0 0 80px;
 }
 
 #block-views-events-block_1, #block-views-events2-block_1{
-	padding: 20px;
+  padding: 20px;
 }
 
 #block-views-events-block_1 p, #block-views-events2-block_1 p, #block-views-events-block_3 p{
-	margin: 0 0 10px 0;
+  margin: 0 0 10px 0;
 }
 
 #block-views-users-block_1 .views-field-name{
 margin: 0 0 0 80px;
 }
 #block-views-users-block_1 .picture{
-	float:left;
+  float:left;
 }
 .views-row-1 views-row-odd views-row-first, .views-row-2 views-row-even, .views-row-3 views-row-odd views-row-last{
-	clear:both;
+  clear:both;
 }
 
 #block-block-1{
-	background: transparent url(images/info-box-background.png) no-repeat;
-	padding: 20px;
-	overflow:hidden;
+  background: transparent url(images/info-box-background.png) no-repeat;
+  padding: 20px;
+  overflow:hidden;
 }
 
 .front-column{
-	width: 30%;
-	float:left;
-	margin-right: 30px;
+  width: 30%;
+  float:left;
+  margin-right: 30px;
 }
 .front-column img{
-	float:left;
+  float:left;
 }
 .front-column p, .front-column h2{
-	margin: 0 0 0 110px;
+  margin: 0 0 0 110px;
 }
 .center-column p, .center-column h2{
-	margin: 0 0 0 80px;
+  margin: 0 0 0 80px;
 }
 
 
-
-
 .views-exposed-widget input#edit-keys{
-	height:30px;
-	width: 400px;
-	position: relative;
-	left: 250px;
-	top: -180px;
+  height:30px;
+  width: 400px;
+  position: relative;
+  left: 250px;
+  top: -180px;
 }
 
 .views-exposed-widget input#edit-submit{
-	position: relative;
-	left: 680px;
-	top: -231px;
+  position: relative;
+  left: 680px;
+  top: -231px;
 }
 
-
-
 /**** SUB NAV *****/
 
 #sub-navigation ul.links{
@@ -592,7 +522,7 @@ margin: 0 0 0 80px;
 }
 #sub-navigation ul.links li a{
   height:38px;
-  color: #FFF;	
+  color: #FFF;
 }
 #sub-navigation ul.links li a:hover, #sub-navigation ul.links li a.active{text-decoration:underline;}
 #sub-navigation ul.links li.last{
diff --git a/templates/comment.tpl.php b/templates/comment.tpl.php
index e739055..5411128 100755
--- a/templates/comment.tpl.php
+++ b/templates/comment.tpl.php
@@ -3,10 +3,10 @@
   <cite><?php print $author; ?></cite> on <?php print format_date($comment->timestamp); ?>
   <div class="commenttext">
     <?php
-        // We hide the comments and links now so that we can render them later.
-        hide($content['links']);
-        print render($content);
-      ?>
+      // We hide the comments and links now so that we can render them later.
+      hide($content['links']);
+      print render($content);
+    ?>
   </div>
   <?php if ($picture) : ?>
     <br class="clear" />
diff --git a/templates/node.tpl.php b/templates/node.tpl.php
index 04b8967..fe5de85 100755
--- a/templates/node.tpl.php
+++ b/templates/node.tpl.php
@@ -1,11 +1,13 @@
 <div id="node-<?php print $node->nid ?>" class="node node-<?php print $node->type ?>">
 
 <?php if (!$page): ?>
-  <h2 class="teaser-title"><a href="<?php print $node_url ?>" title="<?php print $title ?>">
-    <?php print $title ?></a></h2>
+  <h2 class="teaser-title">
+    <a href="<?php print $node_url ?>" title="<?php print $title ?>">
+      <?php print $title ?>
+    </a>
+  </h2>
 <?php endif; ?>
 
-	
 
   <div class="content clear-block">
     <?php print $user_picture; ?>
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 6ef1f09..1a22756 100755
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -3,48 +3,45 @@
 
   <div id="header">
 
-    <?php if ($logo): ?>
-	  <div id="logo">
-		<a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>" rel="home">
-		  <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" id="logo-image" />
-		</a>
-	  </div>
-	<?php endif; ?>
-	
-    <?php if ($site_name): ?>
-	  <h1 id="site-name">
-	    <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>" rel="home">
-	      <?php print $site_name; ?> 
-	    </a>
-      </h1>
-	<?php endif; ?>
-
-    <?php if ($main_menu): ?>
-	  <div id="navigation">
-	    <?php print theme('links__system_main_menu', array(
-          'links' => $main_menu,
-          'attributes' => array(
-            'id' => 'main-menu-links',
-            'class' => array('links', 'primary-links', 'clearfix'),
-          ),
-          'heading' => array(
-            'text' => t('Main menu'),
-            'level' => 'h2',
-            'class' => array('element-invisible'),
-          ),
-        )); ?>
-	  </div>
-	<?php endif; ?>
-
-
-	<?php if ($page['header']): ?>
+  <?php if ($logo): ?>
+    <div id="logo">
+    <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>" rel="home">
+      <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" id="logo-image" />
+    </a>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($site_name): ?>
+    <h1 id="site-name">
+      <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>" rel="home">
+        <?php print $site_name; ?>
+      </a>
+    </h1>
+  <?php endif; ?>
+
+  <?php if ($main_menu): ?>
+    <div id="navigation">
+      <?php print theme('links__system_main_menu', array(
+        'links' => $main_menu,
+        'attributes' => array(
+          'id' => 'main-menu-links',
+          'class' => array('links', 'primary-links', 'clearfix'),
+        ),
+        'heading' => array(
+          'text' => t('Main menu'),
+          'level' => 'h2',
+          'class' => array('element-invisible'),
+        ),
+      )); ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($page['header']): ?>
     <?php print render($page['header']); ?>
   <?php endif; ?>
-	      
-	      
-	  
+
   </div> <!-- end header -->
-  
+
   <div id="sub-navigation">
     <?php print theme('links__system_secondary_menu', array(
       'links' => $secondary_menu,
@@ -59,50 +56,43 @@
       ),
     )); ?>
   </div>
-	
-	
-
-	<div id="main">
-		
-		 <?php print render($page['front']); ?>
-		
-
-	    <div id="sidebar-left">
-		  <div id="blocks-wrapper">
-		     <?php print render($page['sidebar_first']); ?>
-		  </div>
-	    </div>
-	
-	
-	  <div id="main-content">
-		
-		    <?php print $messages ?>
-		
-		
-		   	<?php if ($tabs): ?>
-		        <div class="tabs">
-		          <?php print render($tabs); ?>
-		        </div>
-		      <?php endif; ?>
-		
-			<?php print render($page['content']); ?>
-			
-	  </div>		
-	  
-
-
-	</div>
-
-	
-    <?php if ($page['footer']): ?>
-	    <div id="footer">
-		  <div id="footer-right">
-			<div id="footer-left">
-              <?php print render($page['footer']); ?>
-			</div>
-		  </div>
-	    </div>
-    <?php endif; ?>
-	
-	
+
+  <div id="main">
+
+    <?php print render($page['front']); ?>
+
+    <div id="sidebar-left">
+      <div id="blocks-wrapper">
+        <?php print render($page['sidebar_first']); ?>
+      </div>
+    </div>
+
+    <div id="main-content">
+
+        <?php print $messages ?>
+
+         <?php if ($tabs): ?>
+            <div class="tabs">
+              <?php print render($tabs); ?>
+            </div>
+          <?php endif; ?>
+
+      <?php print render($page['content']); ?>
+
+    </div>
+
+  </div>
+
+
+  <?php if ($page['footer']): ?>
+    <div id="footer">
+    <div id="footer-right">
+    <div id="footer-left">
+            <?php print render($page['footer']); ?>
+    </div>
+    </div>
+    </div>
+  <?php endif; ?>
+
+
 </div>
\ No newline at end of file