diff --git a/css/style.css b/css/style.css
index 7e530eb..01448d6 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,47 +1,3 @@
-body {
-    font-family: sans-serif;
-    /*padding: 0em 0.5em 1em 0.5em;*/
-}
-
-.container {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-@media (orientation:portrait) {
-	.option{
-		width: 100%;
-		margin-left: 0%;
-	}
-}
-
-@media (min-width:768px) {
-  .container {
-    width: 100%;
-  }
-}
-@media (min-width:992px) {
-  .container {
-    width: 970px;
-  }
-}
-@media (min-width:1200px) {
-  .container {
-    width: 1170px;
-  }
-}
-@media (max-width:992px) and (min-resolution:100dpi) and (orientation:portrait) {
-	.btn-block{
-		font-size: 32px;
-		height: 120px;
-	}
-	.btn{
-		font-size: 32px;
-	}
-}
-
 .hsganswer{
       width: 80px;
 	padding-left: auto;
@@ -49,7 +5,7 @@ body {
 	margin-left: auto;
 	margin-right: auto;
 }
-    
+
 .statement {
     min-height: 90px;
 }
@@ -59,12 +15,12 @@ body {
 }
 
 
-.top-buffer { 
-    margin-top:80px; 
+.top-buffer {
+    margin-top:80px;
 }
 
-.bottom-buffer { 
-    margin-bottom:60px; 
+.bottom-buffer {
+    margin-bottom:60px;
 }
 
 .pagination > .pagination-yes > a {
@@ -95,17 +51,3 @@ body {
 .progress {
 	margin-bottom: 0px;
 }
-
-@media (min-width:767px) {
-
-.mow-container {
-    width: 700px;
-}
-  
-.mow-container .form-horizontal .controls {
-    text-align: center;
-    /*margin-left: 130px;*/
-    margin-left: auto;
-    margin-right: auto;
-    display: block;
-}
\ No newline at end of file
diff --git a/index.php b/index.php
index e5a9e3f..a6114db 100644
--- a/index.php
+++ b/index.php
@@ -8,54 +8,50 @@ $baseurl = "http://" . $_SERVER['SERVER_NAME'] . $uri_parts[0];
     <title>Mahlowat</title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta content="Mahlowat">
-    
+
     <meta name="image_src" content="img/mahlowat_logo.png"/>
     <meta name="description" content="Der Mahlowat ist ein Angebot von XYZ und wurde auf Beschluss des XXXV. Studierendenparlaments der Uni Bonn entwickelt. Er ermöglicht es, zu ausgewählten Themen die eigenen Standpunkte mit denen der Listen abzugleichen, die zur Wahl antreten."/>
-    
+
     <meta property="og:title" content="Mahlowat"/>
     <meta property="og:type"  content="website"/>
     <meta property="og:image" content="img/mahlowat_logo.png"/>
     <meta property="og:url"   content=""/>
     <meta property="og:site-name" content="example.com"/>
     <meta property="og:description" content="Der Mahlowat ist ein Angebot von XYZ und wurde auf Beschluss des XXXV. Studierendenparlaments der Uni Bonn entwickelt. Er ermöglicht es, zu ausgewählten Themen die eigenen Standpunkte mit denen der Listen abzugleichen, die zur Wahl antreten."/>
-    
+
     <link href="css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link rel="stylesheet" href="css/font-awesome.min.css">
-    
     <link rel="stylesheet" type="text/css" href="css/style.css">
-    
     <link href="shariff/shariff.min.css" rel="stylesheet">
-    
     <script src="js/jquery-2.0.2.min.js"></script>
-    
   </head>
   <body>
-  
-  <div class="container mow-container" style="margin-top:20px;">
-  
-  <div class="text-center">
-  
-    <img src="img/mahlowat_logo.png" title="Mahlowat Logo"/>
-    
-    <h1><small>Der</small> Mahlowat</h1>
+
+  <div class="container">
+    <div class="row">
+
+      <div class="col-md-8 col-md-offset-2">
+        <div class="text-center">
+          <img src="img/mahlowat_logo.png" title="Mahlowat Logo"/>
+          <h1><small>Der</small> Mahlowat</h1>
+        </div>
+
+        <p>Der Mahlowat ist ein technisches Hilfsmittel, das es ermöglicht, zu ausgewählten Themen die eigenen Standpunkte mit denen der Listen abzugleichen, die zur $Wahl antreten.</p>
+        <p>Er ist selbstverständlich nur als Automat ohne Hirn zu verstehen und spricht keine Wahlempfehlungen aus.</p>
+        <p>Lorem Ipsum.</p>
+        <p>Für ihre Stellungnahmen zu den Thesen sind die Listen selbst verantwortlich.</p>
+        <p class="text-center"><a class="btn btn-large btn-primary" href="mahlowat.php" title="Mahlowat starten">Mit der Befragung beginnen!</a></p>
+
+        <p class="text-center">
+          <a href="faq.php" title="Fragen und Antworten"><small>FAQ</small></a>
+        </p>
+
+        <div class="shariff" data-url="<?php echo $baseurl; ?>" data-referrer-track=null></div>
+      </div>
+
+    </div>
   </div>
-    <p>Der Mahlowat ist ein technisches Hilfsmittel, das es ermöglicht, zu ausgewählten Themen die eigenen Standpunkte mit denen der Listen abzugleichen, die zur $Wahl antreten.</p>
-    
-    <p>Er ist selbstverständlich nur als Automat ohne Hirn zu verstehen und spricht keine Wahlempfehlungen aus.</p>
-    
-    <p>Lorem Ipsum.</p>
-    
-    <p>Für ihre Stellungnahmen zu den Thesen sind die Listen selbst verantwortlich.</p>
-    
-    <p class="text-center"><a class="btn btn-large btn-primary" href="mahlowat.php" title="Mahlowat starten">Mit der Befragung beginnen!</a></p>
-    
-    <p class="text-center"><a href="faq.php" title="Fragen und Antworten"><small>FAQ</small></a></p>
-    
-    
-    
-    <div class="shariff" data-url="<?php echo $baseurl; ?>" data-referrer-track=null></div>
-    <script src="shariff/shariff.min.js"></script>
-  </div>
-  
+
+  <script src="shariff/shariff.min.js"></script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/mahlowat.php b/mahlowat.php
index 37493f3..618ee75 100644
--- a/mahlowat.php
+++ b/mahlowat.php
@@ -1,81 +1,79 @@
-<?php    
-    include 'includes/functions.php';
-    include 'includes/elements.php';
-    //include 'includes/theses.php';
-    
-    $data_content = file_get_contents("config/data.json");
-    if(!$data_content){
-	echo "ERROR READING CONFIG";
-    } else {
-    $data = json_decode($data_content, true);
-    
-    if($data == NULL){
-	echo "ERROR PARSING CONFIG";
-    }
+<?php
+  include 'includes/functions.php';
+  include 'includes/elements.php';
+  //include 'includes/theses.php';
 
-	$css = Array();
-	$css[0] = "bootstrap.min.css";
-	$css[1] = "cerulean.min.css";
-	$css[2] = "cosmo.min.css";
-	$css[3] = "cyborg.min.css";
-	$css[4] = "darkly.min.css";
-	$css[5] = "flatly.min.css";
-	$css[6] = "journal.min.css";
-	$css[7] = "lumen.min.css";
-	$css[8] = "paper.min.css";
-	$css[9] = "readable.min.css";
-	$css[10] = "sandstone.min.css";
-	$css[11] = "simplex.min.css";
-	$css[12] = "slate.min.css";
-	$css[13] = "spacelab.min.css";
-	$css[14] = "superhero.min.css";
-	$css[15] = "united.min.css";
-	$css[16] = "yeti.min.css";
-	$css_id = 9;
-	if(isset($_GET['css'])){
-		$css_id = intval($_GET['css']);
-		if($css_id < 0 || $css_id > 16){
-			$css_id = 0;
-		}
-	}
-    
-    //$theses = get_theses_array();
-    $theses = $data['theses'];
+  $data_content = file_get_contents("config/data.json");
+  if(!$data_content){
+    echo "ERROR READING CONFIG";
+  } else {
+  $data = json_decode($data_content, true);
 
-    $theses_count = sizeof($theses);
-    
-    $ans = Array();
-    $emph = Array();
-    $answerstring = '';
-    $warning = false;
-    $count = 'undefined';
-    
-    if(isset($_POST['count'])){
-		$count = $_POST['count'];
-    }
-    
-    if(isset($_POST['ans'])){
-		$answerstring = $_POST['ans'];
-		$retval = result_from_string($answerstring, $theses_count);
-		$ans = $retval[0];
-		$emph = $retval[1];
-    } elseif(isset($_GET['ans'])){
-		$answerstring = $_GET['ans'];
-		$retval = result_from_string($answerstring, $theses_count);
-		$ans = $retval[0];
-		$emph = $retval[1];
-    } else {
-	$warning = true;
-      for($i = 0; $i < $theses_count; $i++){
-          $ans[$i] = 'skip';
-          $emph[$i] = 1;
-      }
-    }
-    }
+  if($data == NULL){
+    echo "ERROR PARSING CONFIG";
+  }
 
-    
+  $css = Array();
+  $css[0] = "bootstrap.min.css";
+  $css[1] = "cerulean.min.css";
+  $css[2] = "cosmo.min.css";
+  $css[3] = "cyborg.min.css";
+  $css[4] = "darkly.min.css";
+  $css[5] = "flatly.min.css";
+  $css[6] = "journal.min.css";
+  $css[7] = "lumen.min.css";
+  $css[8] = "paper.min.css";
+  $css[9] = "readable.min.css";
+  $css[10] = "sandstone.min.css";
+  $css[11] = "simplex.min.css";
+  $css[12] = "slate.min.css";
+  $css[13] = "spacelab.min.css";
+  $css[14] = "superhero.min.css";
+  $css[15] = "united.min.css";
+  $css[16] = "yeti.min.css";
+  $css_id = 9;
+  if(isset($_GET['css'])){
+    $css_id = intval($_GET['css']);
+    if($css_id < 0 || $css_id > 16){
+      $css_id = 0;
+    }
+  }
 
+  //$theses = get_theses_array();
+  $theses = $data['theses'];
+
+  $theses_count = sizeof($theses);
+
+  $ans = Array();
+  $emph = Array();
+  $answerstring = '';
+  $warning = false;
+  $count = 'undefined';
+
+  if(isset($_POST['count'])){
+    $count = $_POST['count'];
+  }
+
+  if(isset($_POST['ans'])){
+    $answerstring = $_POST['ans'];
+    $retval = result_from_string($answerstring, $theses_count);
+    $ans = $retval[0];
+    $emph = $retval[1];
+  } elseif(isset($_GET['ans'])){
+    $answerstring = $_GET['ans'];
+    $retval = result_from_string($answerstring, $theses_count);
+    $ans = $retval[0];
+    $emph = $retval[1];
+  } else {
+    $warning = true;
+    for($i = 0; $i < $theses_count; $i++){
+        $ans[$i] = 'skip';
+        $emph[$i] = 1;
+    }
+  }
+}
 ?>
+
 <!DOCTYPE html>
 <html>
   <head>
@@ -84,245 +82,237 @@
     <meta content="Mahlowat">
     <!--<link href="css/bootstrap.min.css" rel="stylesheet" media="screen">-->
     <link href="css/<?php echo $css[$css_id];?>" rel="stylesheet" media="screen">
-    
+
     <link rel="stylesheet" type="text/css" href="css/style.css">
   </head>
-  <body>
+
+<body>
   <script src="js/jquery-2.0.2.min.js"></script>
   <script src="js/bootstrap.min.js"></script>
   <script src="js/mahlowat.js"></script>
 
-	<div id="savemodal" class="modal fade bs-example-modal-sm" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
-		<div class="modal-dialog modal-sm">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-					<h4 class="modal-title" id="myModalLabel">Statistik</h4>
-				</div>
-				<div class="modal-body">
-					Erlaubst du, dass dein Aufruf für die Statistik gezählt wird?<br>
-					Falls du Nein auswählst, bist du lediglich als Logeintrag auf dem Server verewigt.<br>
-					<small><a href="faq.php#log" target="_blank">Ich will aber gar keinen Logeintrag!</a></small>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" onclick="callResult(false)" style="width: 100px;"><span class="glyphicon glyphicon-remove"></span> Nein</button>
-					<button type="button" class="btn btn-primary" onclick="callResult(true)" style="width: 100px;"><span class="glyphicon glyphicon-ok"></span> Ja</button>
-				</div>
-			</div>
-		</div>
-	</div>
-  
-  <div class="container" style="margin-top: 20px;">
-	<img src="img/mahlowat_logo.png" title="Mahlowat Logo" class="pull-right" onclick="changeText('mahlowat')"/>
-	<p id="spruch" class="pull-right"></p>
-	<div class="bottom-buffer top-buffer">
-  
-		<?php print_pagination($theses_count); ?>
-		
-		<?php print_thesesbox($theses); ?>
-
-		<p class='text-center'><button id="weight" type="button" class="btn btn-default" data-toggle="button">These doppelt gewichten</button></p>
-
-			<div class="row">
-			<div class="col-xs-12 col-sm-2 col-md-2 col-md-offset-2 col-sm-offset-2 option">
-				<button id='yes' type='submit' class='btn btn-success btn-block' name='yes' onclick="nextThesis('a')"><span class="glyphicon glyphicon-thumbs-up"></span> Zustimmung</button>
-			</div>
-			<div class="col-xs-12 col-sm-2 col-md-2 option">
-				<button id='neutral' type='submit' class='btn btn-warning btn-block' name='neutral' onclick="nextThesis('b')"><span class="glyphicon glyphicon-tree-deciduous"></span> Neutral</button>
-			</div>
-			<div class="col-xs-12 col-sm-2 col-md-2 option">
-				<button id='no' type='submit' class='btn btn-danger btn-block' name='no' onclick="nextThesis('c')"><span class="glyphicon glyphicon-thumbs-down"></span> Ablehnung</button>
-			</div>
-			<div class="col-xs-12 col-sm-2 col-md-2 option">
-				<button id='skip' type='submit' class='btn btn-default btn-block' name='skip' onclick="nextThesis('d')"><span class="glyphicon glyphicon-share-alt"></span> Überspringen</button>
-			</div>
-			</div>
-		
-		
-		<div class="text-right">
-			<hr />
-			<small>Du kannst die Befragung 
-			<a href="index.php" title="Von vorn beginnen">neu starten</a>
-			oder den Rest der Thesen 
-			<a href="#" title="Auswertung anzeigen" onclick="gotoResultPage(resultArray)">überspringen</a>.<br />
-			Außerdem haben wir auch eine <a href="faq.php?from=mahlowat.php" onclick="gotoFAQPage(event, resultArray)" title="FAQ">FAQ-Seite</a>.
-			</small>
-		
-		</div>
-	</div>
+  <div id="savemodal" class="modal fade bs-example-modal-sm" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-sm">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+          <h4 class="modal-title" id="myModalLabel">Statistik</h4>
+        </div>
+        <div class="modal-body">
+          Erlaubst du, dass dein Aufruf für die Statistik gezählt wird?<br>
+          Falls du Nein auswählst, bist du lediglich als Logeintrag auf dem Server verewigt.<br>
+          <small><a href="faq.php#log" target="_blank">Ich will aber gar keinen Logeintrag!</a></small>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" onclick="callResult(false)" style="width: 100px;"><span class="glyphicon glyphicon-remove"></span> Nein</button>
+          <button type="button" class="btn btn-primary" onclick="callResult(true)" style="width: 100px;"><span class="glyphicon glyphicon-ok"></span> Ja</button>
+        </div>
+      </div>
+    </div>
   </div>
-  <script type="text/javascript">
-	var resultArray;
-	var activeThesis = 0;
-	var answerstring = '<?php echo $answerstring; ?>';
-	
-	$(function(){
-		$('.tt').tooltip();
-		$('.explic').hide();
-		$('#weight').click(function(){
-			$('#weight').toggleClass('btn-default');
-			$('#weight').toggleClass('btn-info');
-			if($('#weight').text() == 'These doppelt gewichten'){
-				$('#weight').text('These wird doppelt gewichtet');
-			} else {
-				$('#weight').text('These doppelt gewichten');
-			}
-		});
-		$('.explanationbutton').click(function(event){
-			event.preventDefault();
-			$('.explic').toggle(200);
-		});
-		
-		thesesboxes = $('.singlethesis');	
-		pagination = $('#navigation li');
-		
-		resultArray = resultStringToArray(answerstring, thesesboxes.length);
-		
-		setPaginationColors(resultArray);
-		
-		// Remove the # from the hash, as different browsers may or may not include it
-		var hash = location.hash.replace('#','');
-		
-		if(hash != '' && jQuery.isNumeric(hash)){
-			// Show the hash if it's set
-			loadThesis(hash);
-		} else {
-			loadThesis(activeThesis+1);
-		}
-		
-	});
-	
-	function gotoResultPage(result){
-		count = '<?php echo $count; ?>';
-		if(count != 'true' && count != 'false'){
-			$('#savemodal').modal('show');
-		} else if(count == 'true') {
-			callResult(true);
-		} else {
-			callResult(false);
-		}
-	}
-	
-	function gotoFAQPage(evt, result){
-		callPage(evt, 'faq.php?from=mahlowat.php'+window.location.hash, array2str(result), '<?php echo $count; ?>');
-	}
-	
-	function callResult(count){
-		ans = array2str(resultArray);
-		if(count){
-			url = "count.php?ans=" + ans;
-			jQuery.get(url,function( data ) {
-				callPage(null, 'result.php', ans, 'true');
-			});
-		} else {
-			jQuery.get("count.php?false",function( data ) {
-				callPage(null, 'result.php', ans, 'false');
-			});
-		}
-	}
-	
-	function nextThesis(selection){
-		multiply = false;
-		if($('#weight').hasClass('active')){
-			multiply = true;
-		}
-		resultArray[activeThesis] = result2letter(selection, multiply);
-		pagination.eq(activeThesis).removeClass('pagination-yes pagination-neutral pagination-no');
-		pagination.eq(activeThesis).addClass(letter2paginationclass(selection));
-		if(activeThesis+1 < thesesboxes.length){
-			loadThesis(activeThesis+2);
-		} else {
-			// call result page
-			gotoResultPage(resultArray);
-		}
-	}
-	
-	function loadThesis(number){
-		if(number > thesesboxes.length){
-			number = 1;
-		}
-		activeThesis = number-1;
-		thesesboxes.hide();
-		pagination.removeClass('active');
-		
-		setClasses(resultArray[activeThesis]);
-		
-		thesesboxes.eq(number-1).show();
-		pagination.eq(number-1).addClass('active');
-		location.hash = number;
 
-	}
-	
-	function letter2paginationclass(letter){
-		switch(letter){
-			case 'a':
-			case 'e':
-				return 'pagination-yes';
-				break;
-			case 'b':
-			case 'f':
-				return 'pagination-neutral';
-				break;
-			case 'c':
-			case 'g':
-				return 'pagination-no';
-				break;
-			case 'd':
-			case 'h':
-				return '';
-				break;
-		}
-	}
-	
-	function setClasses(code){
-		$('.explic').hide();
-		if(code < 'e'){
-			$('#weight').removeClass('btn-info');
-			$('#weight').addClass('btn-default');
-			$('#weight').removeClass('active');
-			$('#weight').text('These doppelt gewichten');
-		} else {
-			$('#weight').addClass('btn-info');
-			$('#weight').removeClass('btn-default');
-			$('#weight').addClass('active');
-			$('#weight').text('These wird doppelt gewichtet');
-		}
-		switch (code){
-			case 'a':
-			case 'e':
-				$('#yes').addClass('btn-success');
-				$('#neutral').removeClass('btn-warning');
-				$('#no').removeClass('btn-danger');
-				break;
-			case 'b':
-			case 'f':
-				$('#yes').removeClass('btn-success');
-				$('#neutral').addClass('btn-warning');
-				$('#no').removeClass('btn-danger');
-				break;
-			case 'c':
-			case 'g':
-				$('#yes').removeClass('btn-success');
-				$('#neutral').removeClass('btn-warning');
-				$('#no').addClass('btn-danger');
-				break;
-			case 'd':
-			case 'h':
-				$('#yes').addClass('btn-success');
-				$('#neutral').addClass('btn-warning');
-				$('#no').addClass('btn-danger');
-				break;
-		}
-	}
-	
-	
-	function setPaginationColors(array){
-		for(i = 0; i < array.length; i++){
-			pagination.eq(i).addClass(letter2paginationclass(array[i]));
-		}
-	}
-	
-	
-  </script>
-  </body>
-</html>
\ No newline at end of file
+  <div class="container">
+    <div class="row">
+
+      <div class="col-md-10 col-md-offset-1">
+        <img src="img/mahlowat_logo.png" title="Mahlowat Logo" class="pull-right" onclick="changeText('mahlowat')"/>
+        <p id="spruch" class="pull-right"></p>
+
+        <div class="bottom-buffer top-buffer">
+
+          <?php print_pagination($theses_count); ?>
+          <?php print_thesesbox($theses); ?>
+
+          <p class='text-center'><button id="weight" type="button" class="btn btn-default" data-toggle="button">These doppelt gewichten</button></p>
+
+          <div class="row">
+            <div class="col-xs-12 col-sm-2 col-md-2 col-md-offset-2 col-sm-offset-2 option">
+              <button id='yes' type='submit' class='btn btn-success btn-block' name='yes' onclick="nextThesis('a')"><span class="glyphicon glyphicon-thumbs-up"></span> Zustimmung</button>
+            </div>
+
+            <div class="col-xs-12 col-sm-2 col-md-2 option">
+              <button id='neutral' type='submit' class='btn btn-warning btn-block' name='neutral' onclick="nextThesis('b')"><span class="glyphicon glyphicon-tree-deciduous"></span> Neutral</button>
+            </div>
+
+            <div class="col-xs-12 col-sm-2 col-md-2 option">
+              <button id='no' type='submit' class='btn btn-danger btn-block' name='no' onclick="nextThesis('c')"><span class="glyphicon glyphicon-thumbs-down"></span> Ablehnung</button>
+            </div>
+
+            <div class="col-xs-12 col-sm-2 col-md-2 option">
+              <button id='skip' type='submit' class='btn btn-default btn-block' name='skip' onclick="nextThesis('d')"><span   class="glyphicon glyphicon-share-alt"></span> Überspringen</button>
+            </div>
+          </div>
+
+          <div class="text-right">
+            <hr />
+            <small>Du kannst die Befragung <a href="index.php" title="Von vorn beginnen">neu starten</a> oder den Rest der Thesen <a href="#" title="Auswertung anzeigen" onclick="gotoResultPage(resultArray)">überspringen</a>.<br /> Außerdem haben wir auch eine <a href="faq.php?from=mahlowat.php" onclick="gotoFAQPage(event, resultArray)" title="FAQ">FAQ-Seite</a>.</small>
+          </div>
+
+        </div>
+
+      </div>
+    </div>
+  </div>
+
+
+<script type="text/javascript">
+  var resultArray;
+  var activeThesis = 0;
+  var answerstring = '<?php echo $answerstring; ?>';
+  $(function(){
+    $('.tt').tooltip();
+    $('.explic').hide();
+    $('#weight').click(function(){
+      $('#weight').toggleClass('btn-default');
+      $('#weight').toggleClass('btn-info');
+      if($('#weight').text() == 'These doppelt gewichten'){
+        $('#weight').text('These wird doppelt gewichtet');
+      } else {
+        $('#weight').text('These doppelt gewichten');
+      }
+    });
+
+    $('.explanationbutton').click(function(event){
+      event.preventDefault();
+      $('.explic').toggle(200);
+    });
+
+    thesesboxes = $('.singlethesis');
+    pagination = $('#navigation li');
+
+    resultArray = resultStringToArray(answerstring, thesesboxes.length);
+
+    setPaginationColors(resultArray);
+
+    // Remove the # from the hash, as different browsers may or may not include it
+    var hash = location.hash.replace('#','');
+
+    if(hash != '' && jQuery.isNumeric(hash)){
+      // Show the hash if it's set
+      loadThesis(hash);
+    } else {
+      loadThesis(activeThesis+1);
+    }
+  });
+  function gotoResultPage(result){
+    count = '<?php echo $count; ?>';
+    if(count != 'true' && count != 'false'){
+      $('#savemodal').modal('show');
+    } else if(count == 'true') {
+      callResult(true);
+    } else {
+      callResult(false);
+    }
+  }
+  function gotoFAQPage(evt, result){
+    callPage(evt, 'faq.php?from=mahlowat.php'+window.location.hash, array2str(result), '<?php echo $count; ?>');
+  }
+  function callResult(count){
+    ans = array2str(resultArray);
+    if(count){
+      url = "count.php?ans=" + ans;
+      jQuery.get(url,function( data ) {
+        callPage(null, 'result.php', ans, 'true');
+      });
+    } else {
+      jQuery.get("count.php?false",function( data ) {
+        callPage(null, 'result.php', ans, 'false');
+      });
+    }
+  }
+  function nextThesis(selection){
+    multiply = false;
+    if($('#weight').hasClass('active')){
+      multiply = true;
+    }
+    resultArray[activeThesis] = result2letter(selection, multiply);
+    pagination.eq(activeThesis).removeClass('pagination-yes pagination-neutral pagination-no');
+    pagination.eq(activeThesis).addClass(letter2paginationclass(selection));
+    if(activeThesis+1 < thesesboxes.length){
+      loadThesis(activeThesis+2);
+    } else {
+      // call result page
+      gotoResultPage(resultArray);
+    }
+  }
+  function loadThesis(number){
+    if(number > thesesboxes.length){
+      number = 1;
+    }
+    activeThesis = number-1;
+    thesesboxes.hide();
+    pagination.removeClass('active');
+    setClasses(resultArray[activeThesis]);
+    thesesboxes.eq(number-1).show();
+    pagination.eq(number-1).addClass('active');
+    location.hash = number;
+  }
+  function letter2paginationclass(letter){
+    switch(letter){
+      case 'a':
+      case 'e':
+      return 'pagination-yes';
+      break;
+      case 'b':
+      case 'f':
+      return 'pagination-neutral';
+      break;
+      case 'c':
+      case 'g':
+      return 'pagination-no';
+      break;
+      case 'd':
+      case 'h':
+      return '';
+      break;
+    }
+  }
+  function setClasses(code){
+    $('.explic').hide();
+    if(code < 'e'){
+      $('#weight').removeClass('btn-info');
+      $('#weight').addClass('btn-default');
+      $('#weight').removeClass('active');
+      $('#weight').text('These doppelt gewichten');
+    } else {
+      $('#weight').addClass('btn-info');
+      $('#weight').removeClass('btn-default');
+      $('#weight').addClass('active');
+      $('#weight').text('These wird doppelt gewichtet');
+    }
+    switch (code){
+      case 'a':
+      case 'e':
+      $('#yes').addClass('btn-success');
+      $('#neutral').removeClass('btn-warning');
+      $('#no').removeClass('btn-danger');
+      break;
+      case 'b':
+      case 'f':
+      $('#yes').removeClass('btn-success');
+      $('#neutral').addClass('btn-warning');
+      $('#no').removeClass('btn-danger');
+      break;
+      case 'c':
+      case 'g':
+      $('#yes').removeClass('btn-success');
+      $('#neutral').removeClass('btn-warning');
+      $('#no').addClass('btn-danger');
+      break;
+      case 'd':
+      case 'h':
+      $('#yes').addClass('btn-success');
+      $('#neutral').addClass('btn-warning');
+      $('#no').addClass('btn-danger');
+      break;
+    }
+  }
+  function setPaginationColors(array){
+    for(i = 0; i < array.length; i++){
+      pagination.eq(i).addClass(letter2paginationclass(array[i]));
+    }
+  }
+</script>
+
+</body>
+</html>
diff --git a/multiplier.php b/multiplier.php
index f3790e7..cef68a4 100644
--- a/multiplier.php
+++ b/multiplier.php
@@ -1,77 +1,76 @@
-<?php    
+<?php
     include 'includes/functions.php';
     include 'includes/elements.php';
     #include 'includes/theses.php';
-    
+
     $data_content = file_get_contents("config/data.json");
-    if(!$data_content){
-	echo "ERROR READING CONFIG";
+    if (!$data_content) {
+        echo "ERROR READING CONFIG";
     } else {
-    $data = json_decode($data_content, true);
-    
-    
-    $css = Array();
-	$css[0] = "bootstrap.min.css";
-	$css[1] = "cerulean.min.css";
-	$css[2] = "cosmo.min.css";
-	$css[3] = "cyborg.min.css";
-	$css[4] = "darkly.min.css";
-	$css[5] = "flatly.min.css";
-	$css[6] = "journal.min.css";
-	$css[7] = "lumen.min.css";
-	$css[8] = "paper.min.css";
-	$css[9] = "readable.min.css";
-	$css[10] = "sandstone.min.css";
-	$css[11] = "simplex.min.css";
-	$css[12] = "slate.min.css";
-	$css[13] = "spacelab.min.css";
-	$css[14] = "superhero.min.css";
-	$css[15] = "united.min.css";
-	$css[16] = "yeti.min.css";
-	$css_id = 9;
-	if(isset($_GET['css'])){
-		$css_id = intval($_GET['css']);
-		if($css_id < 0 || $css_id > 16){
-			$css_id = 0;
-		}
-	}
-    
+        $data = json_decode($data_content, true);
+
+
+        $css = array();
+        $css[0] = "bootstrap.min.css";
+        $css[1] = "cerulean.min.css";
+        $css[2] = "cosmo.min.css";
+        $css[3] = "cyborg.min.css";
+        $css[4] = "darkly.min.css";
+        $css[5] = "flatly.min.css";
+        $css[6] = "journal.min.css";
+        $css[7] = "lumen.min.css";
+        $css[8] = "paper.min.css";
+        $css[9] = "readable.min.css";
+        $css[10] = "sandstone.min.css";
+        $css[11] = "simplex.min.css";
+        $css[12] = "slate.min.css";
+        $css[13] = "spacelab.min.css";
+        $css[14] = "superhero.min.css";
+        $css[15] = "united.min.css";
+        $css[16] = "yeti.min.css";
+        $css_id = 9;
+        if (isset($_GET['css'])) {
+            $css_id = intval($_GET['css']);
+            if ($css_id < 0 || $css_id > 16) {
+                $css_id = 0;
+            }
+        }
+
     //$theses = get_theses_array();
     $theses = $data['theses'];
-    
-    $theses_count = sizeof($theses);
-    
-    $ans = Array();
-    $emph = Array();
-    $answerstring = '';
-    $warning = false;
-    $count = 'undefined';
-    
-    if(isset($_POST['count'])){
-		$count = $_POST['count'];
+
+        $theses_count = sizeof($theses);
+
+        $ans = array();
+        $emph = array();
+        $answerstring = '';
+        $warning = false;
+        $count = 'undefined';
+
+        if (isset($_POST['count'])) {
+            $count = $_POST['count'];
+        }
+
+        if (isset($_POST['ans'])) {
+            $answerstring = $_POST['ans'];
+            $retval = result_from_string($answerstring, $theses_count);
+            $ans = $retval[0];
+            $emph = $retval[1];
+        } elseif (isset($_GET['ans'])) {
+            $answerstring = $_GET['ans'];
+            $retval = result_from_string($answerstring, $theses_count);
+            $ans = $retval[0];
+            $emph = $retval[1];
+        } else {
+            $warning = true;
+            for ($i = 0; $i < $theses_count; $i++) {
+                $ans[$i] = 'skip';
+                $emph[$i] = 1;
+            }
+        }
     }
-    
-    if(isset($_POST['ans'])){
-		$answerstring = $_POST['ans'];
-		$retval = result_from_string($answerstring, $theses_count);
-		$ans = $retval[0];
-		$emph = $retval[1];
-    } elseif(isset($_GET['ans'])){
-		$answerstring = $_GET['ans'];
-		$retval = result_from_string($answerstring, $theses_count);
-		$ans = $retval[0];
-		$emph = $retval[1];
-    } else {
-		$warning = true;
-		for($i = 0; $i < $theses_count; $i++){
-			$ans[$i] = 'skip';
-			$emph[$i] = 1;
-		}
-    }
-    
-    }
-    
-    
+
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -81,16 +80,17 @@
     <meta content="">
     <!--<link href="css/bootstrap.min.css" rel="stylesheet" media="screen">-->
     <link href="css/<?php echo $css[$css_id];?>" rel="stylesheet" media="screen">
-    
+
     <link rel="stylesheet" type="text/css" href="css/style.css">
   </head>
   <body>
-  
+
   <script src="js/jquery-2.0.2.min.js"></script>
   <script src="js/bootstrap.min.js"></script>
   <script src="js/mahlowat.js"></script>
-  
-    <?php if($warning){ ?>      
+
+    <?php if ($warning) {
+    ?>
 	<div id="warning" class="modal fade">
 		<div class="modal-dialog">
 			<div class="modal-content">
@@ -100,7 +100,7 @@
 				</div>
 				<div class="modal-body">
 					<p><strong>Anscheinend hast du keine Fragen beantwortet.</strong><br />
-                  Entweder hast du diese Seite direkt aufgerufen, oder du hast die Thesen noch nicht bearbeitet.</p> 
+                  Entweder hast du diese Seite direkt aufgerufen, oder du hast die Thesen noch nicht bearbeitet.</p>
                   <p>Falls letzteres zutrifft, möchten wir dir empfehlen, dies nun zu tun.</p>
 				</div>
 				<div class="modal-footer">
@@ -110,7 +110,7 @@
 			</div><!-- /.modal-content -->
 		</div><!-- /.modal-dialog -->
 	</div><!-- /.modal -->
-      
+
       <script type="text/javascript">
       $(document).ready(function() {
             setTimeout(function(){
@@ -118,41 +118,42 @@
             }, 500);
       });
       </script>
-     <?php } ?>
-  
-  <div class="container mow-container" style="margin-top: 20px;">
+     <?php
+} ?>
+
+  <div class="container">
       <img src="img/mahlowat_logo.png" title="Mahlowat Logo" class="pull-right" onclick="changeText()"/>
 	<p id="spruch" class="pull-right"></p>
-	
+
       <div class="bottom-buffer top-buffer">
-    
+
     <h1>Ergebnisse</h1>
     <p>Klicke auf die Titel, um die zugehörige These anzuzeigen.</p>
       <table class="table table-bordered">
             <tr><th style="width: 320px;">Deine Wahl</th><th>Doppelt gewichten</th>
-            <?php 
-            
-      
-            
-            for($i = 0; $i < sizeof($ans); $i = $i + 1){
-                  ($emph[$i] == 2) ? $active = "btn-info active" : $active = "btn-default";
-                  ($emph[$i] == 2) ? $multbutton = "These wird doppelt gewichtet" : $multbutton = "These doppelt gewichten";
-                  $btnclass = code_to_btnclass(char_to_value($ans[$i]));
-                  $labelclass = code_to_labelclass($ans[$i]);
-                  echo "<tr>";
-                  echo "<td><a id='thesis$i' class='btn $btnclass btn-block' onclick='toggleNext(this)'>".$theses[$i]['s']."</a></td>
+            <?php
+
+
+
+            for ($i = 0; $i < sizeof($ans); $i = $i + 1) {
+                ($emph[$i] == 2) ? $active = "btn-info active" : $active = "btn-default";
+                ($emph[$i] == 2) ? $multbutton = "These wird doppelt gewichtet" : $multbutton = "These doppelt gewichten";
+                $btnclass = code_to_btnclass(char_to_value($ans[$i]));
+                $labelclass = code_to_labelclass($ans[$i]);
+                echo "<tr>";
+                echo "<td><a id='thesis$i' class='btn $btnclass btn-block' onclick='toggleNext(this)'>".$theses[$i]['s']."</a></td>
                   <td><button id='thesis$i-multiply' class='btn btn-block weight $active' data-toggle='button'>$multbutton</button></td>";
-                  echo "</tr>\n";
-                  echo "<tr class='multheseslong'><td class='mtl' colspan='2'><!--<span class='label $labelclass'>These ".($i+1).": ".$theses[$i]['s']."</span><br>--> ".$theses[$i]['l']."</td></tr>";
+                echo "</tr>\n";
+                echo "<tr class='multheseslong'><td class='mtl' colspan='2'><!--<span class='label $labelclass'>These ".($i+1).": ".$theses[$i]['s']."</span><br>--> ".$theses[$i]['l']."</td></tr>";
             }
-            
-            ?>     
+
+            ?>
       </table>
       <button id="commit" class="btn btn-primary">Neu Auswerten</button>
-    
+
     <div class="text-right">
     <hr />
-      <small>Du kannst die Befragung 
+      <small>Du kannst die Befragung
       <a href="index.php" title="Von vorn beginnen">neu starten</a>
       oder deine
       <a href="mahlowat.php" onclick="callPage(event, 'mahlowat.php', array2str(getResultArray()), <?php echo "'$count'"; ?>)" title="Antworten ändern">Antworten ändern</a>.<br />
@@ -161,7 +162,7 @@
     </div>
     </div>
   </div>
-  
+
   <script type="text/javascript">
 	$('#commit').click(function(){
 		resultArray = getResultArray();
@@ -169,7 +170,7 @@
 	});
 	$('.multheseslong').hide();
 	$('.tt').tooltip();
-	
+
 	$('.weight').click(function(){
 		$(this).toggleClass('btn-default');
 		$(this).toggleClass('btn-info');
@@ -179,7 +180,7 @@
 			$(this).text('These doppelt gewichten');
 		}
 	});
-	
+
 	function getResultArray(){
 		multipliers = $('.weight');
 		resultArray = resultStringToArray("<?php echo $answerstring;?>", multipliers.length);
@@ -192,11 +193,11 @@
 		}
 		return resultArray;
 	}
-	
+
 	function toggleNext(caller){
 		$(caller).parent().parent().next().toggle();
 	}
-	
+
 	function gotoResultPage(resultArray){
 		count = '<?php echo $count; ?>';
 		if(count == 'true') {
@@ -205,7 +206,7 @@
 			callResult(resultArray, false);
 		}
 	}
-	
+
 	function callResult(resultArray, count){
 		ans = array2str(resultArray);
 		if(count){
@@ -221,4 +222,4 @@
 	}
   </script>
   </body>
-</html>
\ No newline at end of file
+</html>

Deine Wahl	Doppelt gewichten	".$theses[$i]['s']."	".$theses[$i]['s']."
".$theses[$i]['l']."
".$theses[$i]['l']."