diff --git a/src/theme.scss b/src/theme.scss
index e3ef6fb9f..686cdfcd4 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -479,10 +479,18 @@ multiselect {
 
     .back-to-apps-link {
         position: absolute;
-        left: 0;
-        top: 45px;
-        padding: 20px;
         z-index: 20;
+        top: 50px;
+        left: 0;
+        width: 100%;
+        padding: 10px;
+        background-color: white;
+
+        @media(min-width:768px) {
+            background-color: transparent;
+            width: auto;
+            padding: 20px;
+        }
 
         &:hover,
         &:focus {
@@ -495,6 +503,11 @@ multiselect {
         flex-direction: row;
         margin-bottom: 10px;
         justify-content: space-between;
+        padding: 0 15px;
+
+        @media(min-width:768px) {
+            padding: 0;
+        }
 
         h1 {
             margin-right: 10px;
@@ -521,10 +534,23 @@ multiselect {
     }
 }
 
+.app-configure-links-container {
+    margin-top: 10px;
+    padding: 0;
+}
+
+.card-container {
+    padding: 0;
+}
+
+.app-configure .row {
+    margin: 0;
+}
+
 .app-configure-links {
     div {
         cursor: pointer;
-        display: block;
+        display: inline-block;
         padding: 6px 15px;
         margin: 0;
         overflow: hidden;
@@ -534,6 +560,10 @@ multiselect {
         font-size: 16px;
         user-select: none;
 
+        @media(min-width:768px) {
+            display: block;
+        }
+
         &:hover,
         &:focus {
             text-decoration: none;
diff --git a/src/views/app.html b/src/views/app.html
index 9f910b588..2c396b2fd 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -334,7 +334,7 @@
     </div>
   </div>
 
-  <div class="row" style="margin-top: 10px;">
+  <div class="row app-configure-links-container">
     <div class="col-sm-2">
       <div class="app-configure-links">
         <div ng-click="setView('display')" ng-class="{ 'active': view === 'display', 'disabled': app.error }">Display</div>
@@ -349,7 +349,7 @@
         <div ng-click="setView('uninstall')" ng-class="{ 'active': view === 'uninstall' }">Uninstall</div>
       </div>
     </div>
-    <div class="col-sm-8">
+    <div class="col-sm-8 card-container">
       <div class="card" ng-show="view === 'display'">
         <div class="row">
           <div class="col-md-12">