diff --git a/nbproject/project.properties b/nbproject/project.properties
index 201ead6..dd71494 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -3,7 +3,7 @@ browser.reload.on.save=true
 file.reference.Webdesign-system=../system
 include.path=\
     ${php.global.include.path}
-php.version=PHP_56
+php.version=PHP_55
 source.encoding=UTF-8
 src.dir=.
 tags.asp=false
diff --git a/uvote/page/default_page/tpl/page.tpl b/uvote/page/default_page/tpl/page.tpl
index 11c268f..b419fbb 100644
--- a/uvote/page/default_page/tpl/page.tpl
+++ b/uvote/page/default_page/tpl/page.tpl
@@ -54,11 +54,9 @@
                 </div>
             </nav>
 
-            <div id="site-content">
+            <div class="row" id="site-content">
 
-                <div id="user_main"></div>
-                
-                <div id="user_list"></div>
+                <div class="row" id="user_main"></div>
                 
             </div>
         </div>
diff --git a/uvote/page/user_list_active/tpl/active.tpl b/uvote/page/user_list_active/tpl/active.tpl
index 0404b1b..4700613 100644
--- a/uvote/page/user_list_active/tpl/active.tpl
+++ b/uvote/page/user_list_active/tpl/active.tpl
@@ -1,2 +1,2 @@
-Active List:
+
 ${votelist}
\ No newline at end of file
diff --git a/uvote/page/user_main/main_menu.tpl b/uvote/page/user_main/main_menu.tpl
index f6686ff..cba1880 100644
--- a/uvote/page/user_main/main_menu.tpl
+++ b/uvote/page/user_main/main_menu.tpl
@@ -1,8 +1,8 @@
 <div class="tabbable" id="tabbable_main_menu">
     <ul class="nav nav-tabs" id="tabs_user_main">
-        <li class="active"><a href="#!start(user_main(u))">uVote</a></li>
-        <li><a href="#!start(user_main(ur))">urVote</a></li>
-        <li><a href="#!start(user_main(my))">myVote</a></li>        
+        <li class="active"><a href="#!start(user_main(u))">Abstimmen</a></li>
+        <li><a href="#!start(user_main(ur))">Auswerten</a></li>
+        <li><a href="#!start(user_main(my))">Mithelfen</a></li>        
     </ul>
     <div class="tab-content">        
         <div class="tab-pane active" id="tab_main"></div>
diff --git a/uvote/page/user_main_uVote/tpl/uVote.tpl b/uvote/page/user_main_uVote/tpl/uVote.tpl
index fe3cad5..a12043d 100644
--- a/uvote/page/user_main_uVote/tpl/uVote.tpl
+++ b/uvote/page/user_main_uVote/tpl/uVote.tpl
@@ -1,76 +1,31 @@
-<div style="width: 100%; padding-top: 10px;">
-    <div class="panel-group" id="accordion">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    Welcome
-                </h4>
-            </div>            
-            <div class="panel-body">
-                ${welcome_text}
-            </div>            
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">Übereinstimmung von uVote & Politik</a>
-                </h4>
-            </div>
-            <div id="collapseOne" class="panel-collapse collapse in">
-                <div class="panel-body">
-                    <div style="float: left;">
-                        <table style="border-collapse: separate; border-spacing: 10px 5px; width: 350px;">           
-                            <tr>
-                             <h5>Übereinstimmung von uVote & Politik</h5>
-                             ${uvote_to_bt}
-                             </tr>
-                        </table>
-                    </div>
-                    <div id="graph_bt_uv_overall" style="float: left; width: 300px;"></div>
-                    <script type="text/javascript" language="JavaScript">load_visualisation('graph_bt_uv_overall',84600);</script>
-                </div>
-            </div>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">Entscheidungsverhalten der uVote Community / Bundestag</a>
-                </h4>
-            </div>
-            <div id="collapseTwo" class="panel-collapse collapse">
-                <div class="panel-body">
-                    <div style="width: 50%; margin-bottom: 30px; float: left;">   
-                        <h5>Entscheidungsverhalten der uVote Community</h5>
-                        <span style="">
-                        ${votes_all}
-                        </span>
-                        <span style="">  Wie oft die uVote Community 
-                            <br>  insgesamt Dafür, Dagegen oder 
-                            <br>  Enthaltung gestimmt hat.</span>
-                    </div>
-                    <div style="width: 50%; float: right;">
-                        <h5>Entscheidungsverhalten des Bundestags</h5>
-                        <span style="">
-                        ${votes_all_bt}
-                        </span>
-                        <span style="">  Wie oft der Bundestag 
-                            <br>  Dafür, Dagegen oder 
-                            <br>  Enthaltung gestimmt hat.</span>    
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">uVote Community</a>
-                </h4>
-            </div>
-            <div id="collapseThree" class="panel-collapse collapse">
-                <div class="panel-body">                    
-                    <span class="badge badge-info">${user_count}</span> Nutzer auf uVote
-                </div>
-            </div>
-        </div>
-    </div>                       
+<div class="row">
+<div class="col-md-6">
+    ${welcome_text}
+
+    <span class="badge badge-info">${user_count}</span> Nutzer auf uVote
 </div>
+<div class="col-md-6">
+    <h5>Entscheidungsverhalten der uVote Community</h5>
+            <span style="">
+            ${votes_all}
+            </span>
+            <span style="">  Wie oft die uVote Community 
+                <br>  insgesamt Dafür, Dagegen oder 
+                <br>  Enthaltung gestimmt hat.</span>
+
+
+            <h5>Entscheidungsverhalten des Bundestags</h5>
+            <span style="">
+            ${votes_all_bt}
+            </span>
+            <span style="">  Wie oft der Bundestag 
+                <br>  Dafür, Dagegen oder 
+                <br>  Enthaltung gestimmt hat.</span>
+                        
+</div>
+                
+</div>
+<div class="row" id="list_active_container">
+    ${list_active}
+</div>
+
diff --git a/uvote/page/user_main_uVote/user_main_uVote.php b/uvote/page/user_main_uVote/user_main_uVote.php
index 4d61608..6f80ec0 100644
--- a/uvote/page/user_main_uVote/user_main_uVote.php
+++ b/uvote/page/user_main_uVote/user_main_uVote.php
@@ -69,11 +69,17 @@ class user_main_uVote extends SYSTEM\PAGE\Page {
         $vars = votes::get_user_count();       
         return $vars['count'];
     }
-
+    private function get_list_active(){
+        $classObj = new user_list();
+        $var = $classObj->html();
+        return $var;
+    }
     
 
     public function html(){                 
         $vars = array();
+        $vars['list_active'] = $this->get_list_active();
+
         $vars['uvote_to_bt'] = $this->uvote_to_parties();
         $vars['votes_all'] = $this->votes_all();
         $vars['votes_all_bt'] = $this->votes_all_bt();
diff --git a/uvote/page/user_main_urVote/tpl/all_polls.tpl b/uvote/page/user_main_urVote/tpl/all_polls.tpl
index b57717f..c433c31 100644
--- a/uvote/page/user_main_urVote/tpl/all_polls.tpl
+++ b/uvote/page/user_main_urVote/tpl/all_polls.tpl
@@ -4,7 +4,7 @@
 <div style="width: 280px; border-style: solid; border-width: 1px; padding: 5px;">
     <font size="2">Teilnahme an aktuellen Abstimmungen</font>
     <div class="progress" style="height: 20px;">   
-        <div class="bar" style="width: ${vote_perc}%;">${vote_perc}%</div>
+        <div class="progress-bar" style="width: ${vote_perc}%;">${vote_perc}%</div>
         <div class="bar bar-info" style="width: 100%;"></div>  
     </div>
     <div style="">
diff --git a/uvote/page/user_main_urVote/tpl/overall_all_polls.tpl b/uvote/page/user_main_urVote/tpl/overall_all_polls.tpl
index bcafd92..c31d252 100644
--- a/uvote/page/user_main_urVote/tpl/overall_all_polls.tpl
+++ b/uvote/page/user_main_urVote/tpl/overall_all_polls.tpl
@@ -1,7 +1,7 @@
 <div style="width: 280px; border-style: solid; border-width: 1px; padding: 5px;">
     <font size="2">Abstimmungsquote seit Accounterstellung</font>
     <div class="progress" style="height: 20px;">   
-      <div class="bar" style="width: ${vote_perc}%;">${vote_perc}%</div>
+      <div class="progress-bar" style="width: ${vote_perc}%;">${vote_perc}%</div>
       <div class="bar bar-info" style=""></div>     
     </div>
       <div style="">
diff --git a/uvote/page/user_main_urVote/tpl/urVote.tpl b/uvote/page/user_main_urVote/tpl/urVote.tpl
index 2ed1719..12aaff1 100644
--- a/uvote/page/user_main_urVote/tpl/urVote.tpl
+++ b/uvote/page/user_main_urVote/tpl/urVote.tpl
@@ -1,5 +1,4 @@
-<div id="statistics_uvote_users" style="width: 100%; padding-top:10px;">            
-    
+<div id="statistics_uvote_users" class="row">               
     <div class="panel-group" id="accordion">
         <div class="panel panel-default">
             <div class="panel-heading">
@@ -11,15 +10,14 @@
                 ${urvote_body_text}
             </div>            
         </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
+            <div class="row" style="padding-top: 30px;">
+            <div class="row-heading">
                 <h4 class="panel-title">
                     <a data-toggle="collapse" data-parent="#accordion" href="#collapse_urVote_1">Übereinstimmung von Deiner uVote-Stimme & Politik</a>
                 </h4>
             </div>
-            <div id="collapse_urVote_1" class="panel-collapse collapse in">
-                <div class="panel-body">
-                    <div style="float: left; width: 49%;">
+            <div id="collapse_urVote_1" class="row">
+                    <div class="col-md-6">
                         <table style="border-collapse: separate;
                             border-spacing: 10px 5px; width: 350px;"> 
                             <tr>
@@ -33,39 +31,17 @@
                             </tr>               
                         </table>                        
                     </div>
-                    <div id="right_float" style="float: right; width: 44%;">
+                    <div id="right_float" class="col-md-6">
                     <div>${user_temp_votes}</div>
                     <br>
                     <div>${user_overall_votes}</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapse_urVote_2">Deine Übereinstimmung mit dem Bundestag</a>
-                </h4>
-            </div>
-            <div id="collapse_urVote_2" class="panel-collapse collapse">
-                <div class="panel-body">
-                    <div id="graph_bt_user_overall" style="float: left"></div>
-                    <script type="text/javascript" language="JavaScript">load_visualisation_urvote('graph_bt_user_overall',84600);</script>
-                </div>
-            </div>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapse_urVote_3">Collapsible Group Item #3</a>
-                </h4>
-            </div>
-            <div id="collapse_urVote_3" class="panel-collapse collapse">
-                <div class="panel-body">
-                    Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                    
                 </div>
             </div>
+                    <div id="graph_bt_user_overall" class="row"></div>
+            <script type="text/javascript" language="JavaScript">load_visualisation_urvote('graph_bt_user_overall',84600);</script> 
         </div>
+                          
     </div>   
 </div>