diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 0a12439c359..f37ac4c262a 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -3,7 +3,7 @@
  See the COPYING-README file. */
 
 /* FILE MENU */
-.actions { padding:.3em; float:left; height:2em; }
+.actions { padding:.3em; float:left; height:2em; width: 100%; }
 .actions input, .actions button, .actions .button { margin:0; float:left; }
 
 #new {
@@ -23,7 +23,7 @@
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
 
-#trash { height:17px;  margin:0.3em 0.3em 0.3em 1em; z-index:1010; float: right; }
+#trash { height:17px; margin: 0 1em; z-index:1010; float: right; }
 
 #upload { 
 	height:27px; padding:0; margin-left:0.2em; overflow:hidden;
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 9c12067ae95..0b4aa21eac3 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -35,18 +35,18 @@
 					<a href="#" class="svg" onclick="return false;"></a>
 				</form>
 			</div>
-		</div>
-		<?php if ($_['trash'] ): ?>
+			<?php if ($_['trash'] ): ?>
 			<div id="trash" class="button">
 				<a><?php echo $l->t('Trash');?></a>
 			</div>
-		<?php endif; ?>
-		<div id="uploadprogresswrapper">
-			<div id="uploadprogressbar"></div>
-			<input type="button" class="stop" style="display:none"
-				   value="<?php echo $l->t('Cancel upload');?>"
-				   onclick="javascript:Files.cancelUploads();"
+			<?php endif; ?>
+			<div id="uploadprogresswrapper">
+				<div id="uploadprogressbar"></div>
+				<input type="button" class="stop" style="display:none"
+					value="<?php echo $l->t('Cancel upload');?>"
+					onclick="javascript:Files.cancelUploads();"
 				/>
+			</div>
 		</div>
 		<div id="file_action_panel"></div>
 	<?php else:?>
@@ -59,7 +59,7 @@
 	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
 <?php endif; ?>
 
-<table>
+<table class="hascontrols">
 	<thead>
 		<tr>
 			<th id='headerName'>
diff --git a/core/css/styles.css b/core/css/styles.css
index 80485fd063d..02300ff4cd3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -119,10 +119,18 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 #select_all{ margin-top:.4em !important;}
 
 /* CONTENT ------------------------------------------------------------------ */
-#controls { padding:0 0.5em; width:100%; top:0; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:relative; -moz-box-sizing:border-box; box-sizing:border-box; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
+#controls {
+	position:fixed;
+	height:2.8em; width:100%;
+	padding:0 70px 0 0.5em; margin:0;
+	-moz-box-sizing:border-box; box-sizing:border-box;
+	-moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000;
+	background:#f7f7f7; border-bottom:1px solid #eee;  z-index:50;
+}
 #controls .button { display:inline-block; }
 
 #content { position:relative; height:100%; width:100%; }
+#content .hascontrols { position: relative; top: 3em; }
 #content-wrapper {
 	position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px;
 	-moz-box-sizing:border-box; box-sizing:border-box;
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 3f0d2a9d1c6..ed1232ac322 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -10,7 +10,7 @@
 	<a class="button" target="_blank" href="http://owncloud.org/dev"><?php echo $l->t('Add your App');?></a>
 	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a>
 </div>
-<ul id="leftcontent" class="applist">
+<ul id="leftcontent" class="applist hascontrols">
 	<?php foreach($_['apps'] as $app):?>
 	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?>
 		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 4d7c29678ce..b3cab526947 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -73,7 +73,7 @@ $_['subadmingroups'] = array_flip($items);
 	</div>
 </div>
 
-<table data-groups="<?php echo implode(', ', $allGroups);?>">
+<table class="hascontrols" data-groups="<?php echo implode(', ', $allGroups);?>">
 	<thead>
 		<tr>
 			<th id='headerName'><?php echo $l->t('Login Name')?></th>