diff --git a/htroot/env/base.css b/htroot/env/base.css
index e54fd3964..3f1e9c88c 100644
--- a/htroot/env/base.css
+++ b/htroot/env/base.css
@@ -1031,7 +1031,10 @@ div#info:hover span {
   border: 1px dashed black;
   z-index: 100;
  }
- 
+
+div#tagcloud {
+	line-height:16px;
+}
 
 .info span {
   display: none;
diff --git a/htroot/yacy/ui/css/base.css b/htroot/yacy/ui/css/base.css
index 1f8c2b825..9a067633c 100644
--- a/htroot/yacy/ui/css/base.css
+++ b/htroot/yacy/ui/css/base.css
@@ -247,7 +247,7 @@ p.url a {
 #tagcloud {
 	margin: 10px 10px 10px 7px; /* top right bottom left */
 	text-align: justify;
-	line-height: 1.2em;
+	line-height: 0.9;
 }
 #topwords {
 	max-height: 160px;
diff --git a/htroot/yacysearchtrailer.html b/htroot/yacysearchtrailer.html
index f094dfd54..73c8fa5b1 100644
--- a/htroot/yacysearchtrailer.html
+++ b/htroot/yacysearchtrailer.html
@@ -16,8 +16,8 @@
   data-on-color="warning" data-off-color="success"
   type="checkbox" name="resource-switch" value="local" data-size="large"
   onchange="document.getElementById('resource').value='local';document.searchform.submit();">
-<script>$("[name='resource-switch']").bootstrapSwitch();</script>
 </form>
+<script>$("[name='resource-switch']").bootstrapSwitch();</script>
 <!--
 <span>Your search is done using peers in the YaCy P2P network. You can switch to 'Stealth Mode' which will switch off P2P, giving you full privacy. Expect less results then, because then only your own search index is used.</span>
 -->
@@ -30,14 +30,14 @@
   data-on-color="warning" data-off-color="success"
   type="checkbox" name="resource-switch" value="global" data-size="large"
   onchange="document.getElementById('resource').value='global';document.searchform.submit();">
-<script>$("[name='resource-switch']").bootstrapSwitch();</script>
 </form>
+<script>$("[name='resource-switch']").bootstrapSwitch();</script>
 <!--
 <span>Your search is done using only your own peer, locally. You can switch to 'Peer-to-Peer Mode' which will cause that your search is done using the other peers in the YaCy network.</span>
 -->
 #(/resource-select)#
 
-#(searchdomswitches)#::<p>
+#(searchdomswitches)#::<p class="navbutton">
 <div class="btn-group btn-group-justified">
   #(searchtext)#::<div class="btn-group btn-group-xs"><button type="button" class="btn btn-default#(check)#:: active#(/check)#"#(check)# onclick="document.getElementById('contentdom').value='text';document.searchform.submit();"::#(/check)#>Documents</button></div>#(/searchtext)#
   #(searchimage)#::<div class="btn-group btn-group-xs"><button type="button" class="btn btn-default#(check)#:: active#(/check)#"#(check)# onclick="document.getElementById('contentdom').value='image';document.searchform.submit();"::#(/check)#>Images</button></div>#(/searchimage)#
@@ -47,11 +47,12 @@
 </div>
 </p>#(/searchdomswitches)#
 
-<p>
+<p class="navbutton">
 <div class="btn-group btn-group-justified">
   <div class="btn-group btn-group-xs"><button type="button" id="sort_button_context" class="btn btn-default" onclick="document.getElementById('search').value=document.getElementById('search').value.replace(' /date','');document.searchform.submit();">Context Ranking</button></div>
   <div class="btn-group btn-group-xs"><button type="button" id="sort_button_date" class="btn btn-default" onclick="document.getElementById('search').value=document.getElementById('search').value + ' /date';document.searchform.submit();">Sort by Date</button></div>
 </div>
+</p>
 <script>
   if (document.getElementById('search').value.indexOf(" /date") == -1) {
 	document.getElementById("sort_button_context").setAttribute("class","btn btn-default active");
@@ -61,7 +62,6 @@
 	document.getElementById("sort_button_date").setAttribute("onclick","");
   }
 </script>
-</p>
 
 #(cat-location)#::
 <a href="yacysearch_location.html?query=#[queryenc]#">
@@ -71,7 +71,7 @@
 
 #(nav-topics)#::
 <div id="tagcloud" style="text-align:justify">#{element}#
-<a rel="#[count]#" href="#[url]#" style="text-decoration: none;font-size:#[size]#px;">#[name]#</a>
+<a rel="#[count]#" href="#[url]#" style="text-decoration:none;font-size:#[size]#px;">#[name]#</a>
 #{/element}#</div>
 <script type="text/javascript" charset="utf-8">
 </script>