diff --git a/css/default.css b/css/default.css
index 61d61bb2207ddab47eac4bbf9dc199247487df85..a3cbaab312305c8d40416bb5ffb876fd9f677e83 100755
--- a/css/default.css
+++ b/css/default.css
@@ -2,6 +2,10 @@ body {background-color: #F9F9F9;}
 body.error {background-color: #F0F0F0;}
 body,th,td,ul,li,a,div,p,pre {color:#333333; font-family:Verdana,"Bitstream Vera Sans",Arial,Helvetica,Sans,"Bitstream Vera Serif"; font-size:9.0pt;}
 
+h1 {
+  margin-bottom:1.5em;
+}
+
 .center {
   text-align:center;
 }
@@ -11,6 +15,10 @@ body,th,td,ul,li,a,div,p,pre {color:#333333; font-family:Verdana,"Bitstream Vera
   margin-right:auto;
 }
 
+div#nav {
+  margin-bottom:2em;
+}
+
 a#owncloud-logo {
   margin-left:auto;
   margin-right:auto;
@@ -28,8 +36,8 @@ a#owncloud-logo span {
 .highlighttext {color:#333333; font-size:9pt; font-weight:bold; text-decoration:none;}
 .datetext {color:#333333; font-size:7pt;}
 .sizetext {color:#333333; font-size:7pt;}
-.footer {color:#999999; text-align:center; font-size:9pt;}
-.hint {color:#AAAAAA; text-align:center; font-size:8pt;}
+.footer {color:#999999; text-align:center; font-size:9pt; margin-top:4em;}
+.hint {color:#AAAAAA; text-align:center; font-size:8pt; margin-top:4em; margin-bottom:2em;}
 .hint a{color:#AAAAAA; text-align:center; font-size:8pt;}
 
 .formstyle {
diff --git a/inc/lib_base.php b/inc/lib_base.php
index f452322867406cf2b5c0ed66b57479ed1ee9e073..b8d5bcb9ed4b1f3b0c62f239deb5aa967d7e809c 100755
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
@@ -190,14 +190,14 @@ class OC_DB {
       $DBConnection = @new mysqli($CONFIG_DBHOST, $CONFIG_DBUSER, $CONFIG_DBPWD,$CONFIG_DBNAME);
       if (mysqli_connect_errno()) {
         @ob_end_clean();
-        echo('<html><head></head><body class="error"><br /><br /><div class="center"><b>can not connect to database.</div></body></html>');
+        echo('<html><head></head><body class="error"><div class="center"><b>can not connect to database.</div></body></html>');
         exit();
       }
     }
     $result = @$DBConnection->query($cmd);
     if (!$result) {
-      $entry='DB Error: "'.$DBConnection->error.'"<br />';
-      $entry.='Offending command was: '.$cmd.'<br />';
+      $entry='<p>DB Error: "'.$DBConnection->error.'"</p>';
+      $entry.='<p>Offending command was: '.$cmd.'</p>';
       echo($entry);
     }
     return $result;
diff --git a/inc/lib_files.php b/inc/lib_files.php
index d00444ab09d2924beec7279d6a4ec0e54f843736..39d48c13a971dec929c23fd707dc6b20b1db6e47 100755
--- a/inc/lib_files.php
+++ b/inc/lib_files.php
@@ -82,7 +82,7 @@ class OC_FILES {
       }
     }
     echo('</table>');
-    if(!$filesfound) echo('<br />no files here');
+    if(!$filesfound) echo('<p>no files here</p>');
     echo('</div>');
   }
 
diff --git a/inc/templates/footer.php b/inc/templates/footer.php
index 138d563658a2a24adc166e45a13293cadfe1e08e..9771c797787a2692a70b942c3c8f34508cc923b3 100755
--- a/inc/templates/footer.php
+++ b/inc/templates/footer.php
@@ -1,5 +1,3 @@
-<br />
-<br />
 <p class="footer">
 <?php
   echo($CONFIG_FOOTEROWNERNAME);
diff --git a/inc/templates/header.php b/inc/templates/header.php
index efd235168bdc349e8f4c3ffd32221e2a91157dec..90a9b1c23f0b62448a1c41df6538a7fca517c1ba 100755
--- a/inc/templates/header.php
+++ b/inc/templates/header.php
@@ -11,18 +11,17 @@
 
   if(!isset($_SESSION['username']) or $_SESSION['username']=='') {
 
-    echo('<br /><br /><div class="center">');
+    echo('<div class="center">');
     OC_UTIL::showloginform();
     echo('</div>');
     OC_UTIL::showfooter();
     exit();
   }else{
 
-    echo('<br /><div class="center">');
+    echo('<div id="nav" class="center">');
     OC_UTIL::shownavigation();
     echo('</div>');
 
   }
 
 ?>
-<br />
diff --git a/index.php b/index.php
index 5f7eb8e12baae5bfabf8a87c3f08bfff0a59a709..b33d3502bd655803a1c824ecf2b6c8c5319a90fc 100755
--- a/index.php
+++ b/index.php
@@ -39,7 +39,7 @@ if(isset($_GET['file'])) {
 
   OC_FILES::showbrowser($CONFIG_DATADIRECTORY,$dir);
 
-  echo('<br /><br /><p class="hint">Hint: Mount it via webdav like this: <a href="webdav://'.$_SERVER["HTTP_HOST"].'/webdav/owncloud.php">webdav://'.$_SERVER["HTTP_HOST"].'/webdav/owncloud.php</a></p>');
+  echo('<p class="hint">Hint: Mount it via webdav like this: <a href="webdav://'.$_SERVER["HTTP_HOST"].'/webdav/owncloud.php">webdav://'.$_SERVER["HTTP_HOST"].'/webdav/owncloud.php</a></p>');
 
   OC_UTIL::showfooter();
 
diff --git a/plugins/music/index.php b/plugins/music/index.php
index 622a89d7e7a37e1faab303ced553d8e5607f116d..f9a7c8a2e88925a16dc65f1570a10b214a70b158 100755
--- a/plugins/music/index.php
+++ b/plugins/music/index.php
@@ -29,7 +29,7 @@ OC_UTIL::showheader();
 
 echo('<div class="center">');
 echo('nothing here yet :-)');
-echo('</div><br /><br />');
+echo('</div>');
 
 
 OC_UTIL::showfooter();
diff --git a/plugins/test/index.php b/plugins/test/index.php
index 622a89d7e7a37e1faab303ced553d8e5607f116d..f9a7c8a2e88925a16dc65f1570a10b214a70b158 100755
--- a/plugins/test/index.php
+++ b/plugins/test/index.php
@@ -29,7 +29,7 @@ OC_UTIL::showheader();
 
 echo('<div class="center">');
 echo('nothing here yet :-)');
-echo('</div><br /><br />');
+echo('</div>');
 
 
 OC_UTIL::showfooter();
diff --git a/settings/index.php b/settings/index.php
index 61296433673c941d4d285750e632efafbb5cbccb..467e0ad96322350f2f999973a5863d4118286681 100755
--- a/settings/index.php
+++ b/settings/index.php
@@ -28,7 +28,7 @@ OC_UTIL::showheader();
 
 echo('<div class="center">');
 echo('nothing here yet :-)');
-echo('</div><br /><br />');
+echo('</div>');
 
 
 OC_UTIL::showfooter();