diff --git a/lib/autoload.inc b/lib/autoload.inc
index 3e8ed78..89d6dd6 100644
--- a/lib/autoload.inc
+++ b/lib/autoload.inc
@@ -1,3 +1,3 @@
 <?php 
 require_once dirname(__FILE__).'/system/autoload.inc';
-require_once dirname(__FILE__).'/lib_font_awesome/autoload.inc';
\ No newline at end of file
+require_once dirname(__FILE__).'/font_awesome/autoload.inc';
\ No newline at end of file
diff --git a/uvote/page/default_page/tpl/page.tpl b/uvote/page/default_page/tpl/page.tpl
index 1621a7e..8e00cb6 100644
--- a/uvote/page/default_page/tpl/page.tpl
+++ b/uvote/page/default_page/tpl/page.tpl
@@ -18,14 +18,24 @@
                     </div>
                     <div class="col-md-6" style="margin: 0; padding: 0; text-align: right;">
                             ${loginform}
-                            <br>
-                            <li class="fa fa-facebook fa-lg"></li>
-                            <br>
-                            <li class="fa fa-twitter fa-lg"></li>
                     </div>
                     
                 </div>
-                <div class="row" style="margin-bottom: 15px;">${menu}</div>            
+                <div class="row" style="margin-bottom: 15px;">
+                    
+                    <div class="col-md-6" style="margin: 0; padding: 0;">
+                        ${menu}
+                    </div>
+                    <div class="col-md-6" style="margin: 0; padding: 0;">
+                        <div class="row">
+                            <ul class="nav nav-pills pull-right">
+                                <li> <a href="#"><span class="fa fa-facebook fa-lg"></span>&nbsp;&nbsp;facebook&nbsp;&nbsp;</a></li>
+                                <li><a href="https://twitter.com/uvote_de" target="blank"><span class="fa fa-twitter fa-lg"></span>&nbsp;&nbsp;twitter</a></li>
+                        </ul> 
+                        </div>
+                        
+                    </div>
+                    </div>            
                 <div class="row" id="user_main"></div> 
                 <a href="#!start(user_main(imp))">&nbsp;&nbsp;Impressum</a>
             </div>
diff --git a/uvote/page/user_main_votelist/tpl/vote.tpl b/uvote/page/user_main_votelist/tpl/vote.tpl
index d470473..132d5a9 100644
--- a/uvote/page/user_main_votelist/tpl/vote.tpl
+++ b/uvote/page/user_main_votelist/tpl/vote.tpl
@@ -8,10 +8,8 @@
             ${title}
         </div>
         <div class="col-md-1">
-            <label class="label label-primary" style="padding: 5px">
             <span class="glyphicon glyphicon-info-sign"></span>
             ${statusmarker}
-            </label>
             <br>
             <font size="1">${votecount}&nbsp;Stimme/n</font>
         </div>
@@ -19,8 +17,8 @@
             <a href="#!start(poll);poll.${ID}" class="btn btn-primary btn-small" poll_ID="${ID}"><span class="glyphicon glyphicon-eye-open"></span>&nbsp;&nbsp;Abstimmen</a>
         </div>
     </div>  
-        <br>
-    <div class="row" style="border-top: 1px solid #ccc">
+        
+    <div class="row" style="border-bottom: 1px solid #ccc">
         <div class="col-md-8" style="padding: 5px;">
             ${tags}
         </div>