diff --git a/template.php b/template.php
index 2bcc0bb..38e8113 100644
--- a/template.php
+++ b/template.php
@@ -1,11 +1,16 @@
 <?php
 /**
+ * @file
+ * Template and preprocess functions for Touch theme.
+ */
+
+/**
  * Implements hook_html_head_alter().
  * This will overwrite the default meta character type tag with HTML5 version.
  */
 function touch_html_head_alter(&$head_elements) {
   $head_elements['system_meta_content_type']['#attributes'] = array(
-    'charset' => 'utf-8'
+    'charset' => 'utf-8',
   );
 }
 
@@ -17,8 +22,8 @@ function touch_breadcrumb($variables) {
   if (!empty($breadcrumb)) {
     // Use CSS to hide titile .element-invisible.
     $output = '<h2 class="element-invisible">' . t('You are here') . '</h2>';
-    // comment below line to hide current page to breadcrumb
-	$breadcrumb[] = drupal_get_title();
+    // Comment below line to hide current page to breadcrumb.
+    $breadcrumb[] = drupal_get_title();
     $output .= '<nav class="breadcrumb">' . implode(' » ', $breadcrumb) . '</nav>';
     return $output;
   }
@@ -38,7 +43,7 @@ function touch_preprocess_page(&$vars) {
         'text' => t('Main menu'),
         'level' => 'h2',
         'class' => array('element-invisible'),
-      )
+      ),
     ));
   }
   else {
@@ -54,12 +59,41 @@ function touch_preprocess_page(&$vars) {
         'text' => t('Secondary menu'),
         'level' => 'h2',
         'class' => array('element-invisible'),
-      )
+      ),
     ));
   }
   else {
     $vars['secondary_menu'] = FALSE;
   }
+  if ($vars['logo']) {
+    $site_logo = '<img src="' . $vars['logo'] . '" alt=" ' . t('Home') . ' />';
+    $vars['logo'] = l($site_logo, '<front>', array('attributes' => array('title' => t('Home')), 'html' => TRUE));
+  }
+  if (theme_get_setting('social_icons')) {
+    global $base_url;
+    $prefix = $vars['language']->prefix ? $vars['language']->prefix . '/' : '';
+    $twitter_logo = '<img src="/' . $vars['directory'] . '/images/twitter.png" alt="twitter"/>';
+    $facebook_logo = '<img src="/' . $vars['directory'] . '/images/facebook.png" alt="facebook"/>';
+    $rss_logo = '<img src="/' . $vars['directory'] . '/images/rss.png" alt="RSS"/>';
+    $social_links = array(
+      'twitter' => l($twitter_logo, 'http://www.twitter.com/' . theme_get_setting('twitter_username'), array(
+        'html' => TRUE,
+        'attributes' => array(
+          'target' => '_blank',
+          'rel' => 'me'),
+        )
+      ),
+      'facebok' => l($facebook_logo, 'http://www.facebook.com/' . theme_get_setting('facebook_username'), array(
+        'html' => TRUE,
+        'attributes' => array(
+          'target' => '_blank',
+          'rel' => 'me'),
+        )
+      ),
+      'rss' => l($rss_logo, $prefix . 'rss.xml', array('html' => TRUE)),
+    );
+    $vars['social_icons'] = theme('item_list', array('items' => $social_links, 'attributes' => array('id' => 'header-social')));
+  }
 }
 
 /**
@@ -91,4 +125,4 @@ function touch_preprocess_node(&$variables) {
   if ($variables['view_mode'] == 'full' && node_is_page($variables['node'])) {
     $variables['classes_array'][] = 'node-full';
   }
-}
\ No newline at end of file
+}
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 9895171..1276a6a 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -65,91 +65,83 @@
  */
 ?>
 <div id="wrapper" class="clearfix">
-<div id="header-top" class="clearfix">
-<div id="logo"><!--start logo-->
-<?php if ($logo): ?>
-<a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>">
-<img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
-</a>
-<?php endif; ?>
-<div id="site-slogan"><?php if ($site_slogan): ?><?php print $site_slogan; ?><?php endif; ?></div><!--site slogan-->
-</div><!--end logo-->
- <?php if ($page['search_box']): ?><!-- / start search box region -->
-    <div class="search-box">
-      <?php print render($page['search_box']); ?>
-    </div> <!-- / end search box region -->
- <?php endif; ?>
- <?php if (theme_get_setting('social_icons')): ?>
-<ul id="header-social">
-<li><a href="http://www.twitter.com/<?php echo theme_get_setting('twitter_username'); ?>" target="_blank" rel="me"><img src="<?php global $base_url; echo $base_url.'/'.$directory; ?>/images/twitter.png" alt="twitter"/></a></li>
-<li><a href="http://www.facebook.com/<?php echo theme_get_setting('facebook_username'); ?>" target="_blank" rel="me"><img src="<?php global $base_url; echo $base_url.'/'.$directory; ?>/images/facebook.png" alt="facebook"/></a></li>
-<li><a href="<?php print $front_page . ($language->prefix ? '/' : ''); ?>rss.xml"><img src="<?php global $base_url; echo $base_url.'/'.$directory; ?>/images/rss.png" alt="RSS"/></a></li>
-</ul><!--end header-social-->
-<?php endif; ?>
-</div><!--end header-top-->
-<div id="header" class="clearfix"><!--start header--> 
+  <div id="header-top" class="clearfix">
+    <div id="logo"><!--start logo-->
+      <?php if ($logo): ?><?php print $logo; ?><?php endif; ?>
+      <?php if ($site_slogan): ?><div id="site-slogan"><?php print $site_slogan; ?></div><?php endif; ?><!--site slogan-->
+    </div><!--end logo-->
+    <?php if ($page['search_box']): ?><!-- / start search box region -->
+      <div class="search-box">
+        <?php print render($page['search_box']); ?>
+      </div> <!-- / end search box region -->
+    <?php endif; ?>
+    <?php if ($social_icons): ?>
+        <?php print $social_icons; ?>
+    <?php endif; ?>
+  </div><!--end header-top-->
+  <div id="header" class="clearfix"><!--start header-->
     <?php print render($page['header']); ?>
-<div id="main-menu">
-    <?php 
-	$main_menu_tree = menu_tree(variable_get('menu_main_links_source', 'main-menu')); 
-	print drupal_render($main_menu_tree);
-	?>
-</div><!-- end main-menu -->
-</div> <!-- /#header -->
-<div id="content-body">
-<div class="breadcrumb"><?php if ($breadcrumb): print $breadcrumb; endif;?></div>
-  <section id="main" role="main" class="clear">
-    <?php print $messages; ?>
-    <a id="main-content"></a>
-    <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
-    <?php print render($title_prefix); ?>
-    <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
-    <?php print render($title_suffix); ?>
-    <?php if (!empty($tabs['#primary'])): ?><div class="tabs-wrapper clearfix"><?php print render($tabs); ?></div><?php endif; ?>
-    <?php print render($page['help']); ?>
-    <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
-    <?php print render($page['content']); ?>
-  </section> <!-- /#main -->
-  
-  <?php if ($page['sidebar_first']): ?>
-    <aside id="sidebar-first" role="complementary" class="sidebar clearfix">
-      <?php print render($page['sidebar_first']); ?>
-    </aside>  <!-- /#sidebar-first -->
-  <?php endif; ?>
+    <div id="main-menu">
+      <?php
+        $main_menu_tree = menu_tree(variable_get('menu_main_links_source', 'main-menu'));
+        print drupal_render($main_menu_tree);
+      ?>
+    </div><!-- end main-menu -->
+  </div> <!-- /#header -->
+  <div id="content-body">
+    <div class="breadcrumb"><?php if ($breadcrumb): print $breadcrumb; endif;?></div>
+    <section id="main" role="main" class="clear">
+      <?php print $messages; ?>
+      <a id="main-content"></a>
+      <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
+      <?php print render($title_prefix); ?>
+      <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
+      <?php print render($title_suffix); ?>
+      <?php if (!empty($tabs['#primary'])): ?><div class="tabs-wrapper clearfix"><?php print render($tabs); ?></div><?php endif; ?>
+      <?php print render($page['help']); ?>
+      <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
+      <?php print render($page['content']); ?>
+    </section> <!-- /#main -->
 
-  <?php if ($page['sidebar_second']): ?>
-    <aside id="sidebar-second" role="complementary" class="sidebar clearfix">
-      <?php print render($page['sidebar_second']); ?>
-    </aside>  <!-- /#sidebar-second -->
-  <?php endif; ?>
-</div> <!-- end content-body -->
-<div class="clear"></div>
-<div id="footer" class="clearfix">
- <?php if ($page['footer_first']): ?><!-- / start first footer block -->
-    <div class="first-footer">
-      <?php print render($page['footer_first']); ?>
-    </div> <!-- / end first footer -->
-  <?php endif; ?>
- <?php if ($page['footer_second']): ?><!-- / start second footer block -->
-    <div class="second-footer">
-      <?php print render($page['footer_second']); ?>
-    </div> <!-- / end second footer -->
-  <?php endif; ?>
- <?php if ($page['footer_third']): ?><!-- / start third footer block -->
-    <div class="second-footer">
-      <?php print render($page['footer_third']); ?>
-    </div> <!-- / end third footer -->
-  <?php endif; ?>
- <?php if ($page['footer_fourth']): ?><!-- / start fourth footer block -->
-    <div class="second-footer">
-      <?php print render($page['footer_fourth']); ?>
-    </div> <!-- / end fourth footer -->
-  <?php endif; ?>
-<div class="clear"></div>
-<?php print render($page['footer']) ?>
-<div class="clear"></div>
-<?php if (theme_get_setting('footer_copyright')): ?>
-<div id="copyright">Copyright &copy; <?php echo date("Y"); ?>, <?php print $site_name; ?></div>
-<?php endif; ?>
-</div> <!-- /#footer -->
-</div> <!-- /#wrapper -->
\ No newline at end of file
+    <?php if ($page['sidebar_first']): ?>
+      <aside id="sidebar-first" role="complementary" class="sidebar clearfix">
+        <?php print render($page['sidebar_first']); ?>
+      </aside>  <!-- /#sidebar-first -->
+    <?php endif; ?>
+
+    <?php if ($page['sidebar_second']): ?>
+      <aside id="sidebar-second" role="complementary" class="sidebar clearfix">
+        <?php print render($page['sidebar_second']); ?>
+      </aside>  <!-- /#sidebar-second -->
+    <?php endif; ?>
+  </div> <!-- end content-body -->
+  <div class="clear"></div>
+  <div id="footer" class="clearfix">
+    <?php if ($page['footer_first']): ?><!-- / start first footer block -->
+      <div class="first-footer">
+        <?php print render($page['footer_first']); ?>
+      </div> <!-- / end first footer -->
+    <?php endif; ?>
+    <?php if ($page['footer_second']): ?><!-- / start second footer block -->
+      <div class="second-footer">
+        <?php print render($page['footer_second']); ?>
+      </div> <!-- / end second footer -->
+    <?php endif; ?>
+    <?php if ($page['footer_third']): ?><!-- / start third footer block -->
+      <div class="second-footer">
+        <?php print render($page['footer_third']); ?>
+      </div> <!-- / end third footer -->
+    <?php endif; ?>
+    <?php if ($page['footer_fourth']): ?><!-- / start fourth footer block -->
+      <div class="second-footer">
+        <?php print render($page['footer_fourth']); ?>
+      </div> <!-- / end fourth footer -->
+    <?php endif; ?>
+    <div class="clear"></div>
+    <?php print render($page['footer']) ?>
+    <div class="clear"></div>
+    <?php if (theme_get_setting('footer_copyright')): ?>
+      <div id="copyright">Copyright &copy; <?php echo date("Y"); ?>, <?php print $site_name; ?></div>
+    <?php endif; ?>
+  </div> <!-- /#footer -->
+</div> <!-- /#wrapper -->