diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index c5180c24a..411577cb1 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -1,7 +1,7 @@
 <div class="row animateMeOpacity ng-hide" ng-show="installedApps.length === 0 && user.admin">
     <div class="col-lg-6 col-lg-offset-3" style="text-align: center;">
         <br/><br/><br/><br/>
-        <h1><i class="fa fa-cloud-download fa-fw"></i> Your Cloudron does not have any apps installed yet!</h1>
+        <h1><i class="fa fa-cloud-download fa-fw"></i> No apps installed yet!</h1>
         <br/></br>
         <h3>How about installing some? Check out the <a href="#/appstore">App Store</a></h3>
     </div>
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index 0b0ac164d..b470d59e1 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -236,38 +236,24 @@
 </div>
 
 <div ng-show="ready && validAppstoreAccount" class="ng-cloak">
-    <div class="row-no-margin">
+    <div class="row">
         <div class="col-md-2">
-        </div>
-        <div class="col-md-8 col-same-height">
             <br/>
-            <h1>Available Applications</h1>
-            <br/>
-        </div>
-        <div class="col-md-2 col-same-height" style="float: right;">
-            <br/>
-            <div class="appstore-search">
+            <div>
                 <form ng-submit="search()">
                     <div class="input-group">
-                        <input type="text" class="form-control" placeholder="Search for..." ng-model="searchString" ng-change="search()">
-                        <span class="input-group-btn">
-                            <button class="btn btn-default" type="button" type="submit" ng-click="search()"><i class="fa fa-search"></i></button>
-                        </span>
+                        <input type="text" class="form-control" style="height: 40px" placeholder="Search" ng-model="searchString" ng-change="search()">
                     </div>
                 </form>
             </div>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-2">
+            <br/>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === '' }" category="">All</a>
             <br/>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'blog' }" category="blog"><i class="fa fa-font"></i> Blog</a>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'chat' }" category="chat"><i class="fa fa-comments-o"></i> Chat</a>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'git' }" category="git"><i class="fa fa-code-fork"></i> Code Hosting</a>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'email' }" category="email"><i class="fa fa-envelope-o"></i> Email</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'gallery' }" category="gallery"><i class="fa fa-picture-o"></i> Image Galleries</a>
+            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'gallery' }" category="gallery"><i class="fa fa-picture-o"></i> Gallery</a>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'sync' }" category="sync"><i class="fa fa-refresh"></i> Sync</a>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'notes' }" category="notes"><i class="fa fa-sticky-note-o"></i> Notes</a>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'project' }" category="project"><i class="fa fa-line-chart"></i> Project Management</a>