diff --git a/includes/login.php b/includes/login.php
index 6ef4bd5..d7ff2b2 100644
--- a/includes/login.php
+++ b/includes/login.php
@@ -39,7 +39,7 @@ if ($isAdmin) {
 
 ?>
 
-<form action="<?php echo $_SERVER['PHP_SELF']; if ($GETVars['qq'] != 'logout'){ echo '?q='.$GETVars['qq'].'&m='.$GETVars['menu']; } ?>" method="post">
+<form action="<?php echo $_SERVER['PHP_SELF']; if ($GETVars['qq'] != 'logout') { echo '?q='.$GETVars['qq'].'&m='.$GETVars['menu']; } ?>" method="post">
 	<br>
 	<br>
 	<br>
diff --git a/includes/topnav.php b/includes/topnav.php
index 37c9abb..179e0dc 100644
--- a/includes/topnav.php
+++ b/includes/topnav.php
@@ -42,7 +42,7 @@
 			$types = array('normal view', 'timetable', 'timetable2');
 			foreach ($types as $type) {
 				echo '<option value="'.$type.'"';
-				if ($_SESSION['tabletype'] == $type){echo "SELECTED";}
+				if ($_SESSION['tabletype'] == $type) echo "SELECTED";
 				echo '> '.$type.'</option>';
 			}
 			echo "</select>";
@@ -56,7 +56,7 @@
 
 		while(list($servername,$serveritems) = each($tsmmonitor->configarray["serverlist"])) {
 			echo '<option value="'.$servername.'"';
-			if ($tsmmonitor->GETVars['server'] == $servername){echo "SELECTED";}
+			if ($tsmmonitor->GETVars['server'] == $servername) echo "SELECTED";
 			echo '> '.$servername.' ('.$serveritems["description"].')</option>';
 		}
 		echo "</select>";
diff --git a/includes/tsmmonitor.php b/includes/tsmmonitor.php
index 2fbd571..6a7d3a6 100644
--- a/includes/tsmmonitor.php
+++ b/includes/tsmmonitor.php
@@ -290,7 +290,7 @@ class TSMMonitor {
 
 		foreach ($lines as $line) {
 			$linebox .= '<option value="'.$line.'"';
-			if ($linesel == $line) {$linebox.= "SELECTED";}
+			if ($linesel == $line) $linebox.= "SELECTED";
 			$linebox .=  '> '.$line.' </option>';
 		}
 		$linebox .= "</select></form>";
@@ -396,7 +396,7 @@ class TSMMonitor {
 
 		if (!isset($menu)) { return ""; };
         $this->menuindent++;
-        for ($i=1;$i<$this->menuindent;$i++){
+        for ($i=1;$i<$this->menuindent;$i++) {
             $indent .= "&nbsp;&nbsp;&nbsp;";
         }
 		while (list($key, $val) = each($menu)) {
@@ -492,7 +492,7 @@ class TSMMonitor {
 					$fileName = str_replace('.css', '', $file);
 					$fileName = str_replace('style_', '', $fileName);
 					$ret .=  '<option value="' . $file . '"';
-					if ($_SESSION['stylesheet'] == $file){ $ret .= "SELECTED"; }
+					if ($_SESSION['stylesheet'] == $file) $ret .= "SELECTED";
 					$ret .=  '>' . $fileName . '</option>';
 				}
 			}
@@ -985,17 +985,17 @@ class TSMMonitor {
         $searcharr = $_SESSION["search"][$this->GETVars['qq']];
         if ($_POST["wcfield"] != "") {
             $arrfield = $_POST["wcfield"];
-        } else if (isset($searcharr)){
+        } else if (isset($searcharr)) {
             $arrfield = $searcharr["field"];
         }
         if ($_POST["wcval"] != "") {
             $arrval = $_POST["wcval"];
-        } else if (isset($searcharr)){
+        } else if (isset($searcharr)) {
             $arrval = $searcharr["val"];
         }
         if ($_POST["wcop"] != "") {
             $arrop = $_POST["wcop"];
-        } else if (isset($searcharr)){
+        } else if (isset($searcharr)) {
             $arrop = $searcharr["op"];
         }
 		$sql = "SHOW COLUMNS FROM res_".$this->configarray["queryarray"][$this->GETVars['qq']]["name"]."_".$this->GETVars['server'];
@@ -1006,7 +1006,7 @@ class TSMMonitor {
 		foreach ($fieldnames as $field) {
 			if ($field['Field'] != "timestamp") {
 				$fieldbox.= '<option value="'.$field['Field'].'"';
-				if ($arrfield == $field['Field']) {$fieldbox.= "SELECTED";}
+				if ($arrfield == $field['Field']) $fieldbox.= "SELECTED";
 				$fieldbox.=  '> '.$field['Field'].' </option>';
 			}
 		}
@@ -1017,7 +1017,7 @@ class TSMMonitor {
 		$opbox = "<select name='wcop' size=1 onChange='' class='button topnavbutton'>";
 		foreach ($operators as $op) {
 			$opbox.= '<option value="'.$op.'"';
-			if ($arrop == $op) {$opbox.= "SELECTED";}
+			if ($arrop == $op) $opbox.= "SELECTED";
 			$opbox.=  '> '.$op.' </option>';
 		}
 		$opbox.= "</select>";
@@ -1234,7 +1234,7 @@ class TSMMonitor {
 		// build combobox
 		while (list($label,$value) = each($timesteps)) {
 			$out .= '<option value="'.$value.'"';
-			if ($_SESSION['selectedtimestep'] == $value){$out .=  "SELECTED";}
+			if ($_SESSION['selectedtimestep'] == $value) $out .=  "SELECTED";
 			$out .= '> '.$label.'</option>';
 		}
 		$out .= "</select>";
diff --git a/index.php b/index.php
index c0a6250..5c2e21c 100644
--- a/index.php
+++ b/index.php
@@ -86,8 +86,8 @@ include_once "includes/page_head.php";
 			<?php
 
 			// main content, right of menu
-			if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass"]) && $tsmmonitor->GETVars['qq'] != "logout" && $_SESSION["logindata"]["loggedin"]){
-				if ($tsmmonitor->GETVars['qq'] != "" && $tsmmonitor->GETVars['qq'] != "overview"){
+			if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass"]) && $tsmmonitor->GETVars['qq'] != "logout" && $_SESSION["logindata"]["loggedin"]) {
+				if ($tsmmonitor->GETVars['qq'] != "" && $tsmmonitor->GETVars['qq'] != "overview") {
 
 					// show overview page
 					if ($tsmmonitor->GETVars['qq'] == "index") {
@@ -97,7 +97,7 @@ include_once "includes/page_head.php";
 					} else if ($tsmmonitor->GETVars['qq'] == "polldstat") {
                         $lines = $_POST["lpp"];
                         if ($lines != "") {
-                            if (!isset($_SESSION["lines"])){
+                            if (!isset($_SESSION["lines"])) {
                                 $temp = array();
                                 $temp[$tsmmonitor->GETVars['qq']] = $lines;
                                 $_SESSION["lines"] = $temp;
@@ -145,7 +145,7 @@ include_once "includes/page_head.php";
 							if ($_POST["Clear"] == "Clear") {
 								$_SESSION["search"][$tsmmonitor->GETVars['qq']] = "";
 							} else {
-								if (!isset($_SESSION["search"])){
+								if (!isset($_SESSION["search"])) {
 									$temp = array();
 									$temp[$tsmmonitor->GETVars['qq']] = $whereclause;
 									$_SESSION["search"] = $temp;
@@ -189,7 +189,7 @@ include_once "includes/page_head.php";
 						} else {
                             $lines = $_POST["lpp"];
                             if ($lines != "") {
-                                if (!isset($_SESSION["lines"])){
+                                if (!isset($_SESSION["lines"])) {
                                     $temp = array();
                                     $temp[$tsmmonitor->GETVars['qq']] = $lines;
                                     $_SESSION["lines"] = $temp;
@@ -219,7 +219,7 @@ include_once "includes/page_head.php";
 					}
 				}
 			} else {
-				if (isset($_SESSION["logindata"])){
+				if (isset($_SESSION["logindata"])) {
 					$errormsg = "Login failed!";
 				}else{
 					$errormsg = "Login";