diff --git a/src/main/webapp/app/mock-search/mock-search.component.html b/src/main/webapp/app/mock-search/mock-search.component.html
index 0fdf087eb6f39218f651a80a3c385a86ba995f46..4232aa1e7adaa1033fe8f58a4ad8faec6edd4949 100644
--- a/src/main/webapp/app/mock-search/mock-search.component.html
+++ b/src/main/webapp/app/mock-search/mock-search.component.html
@@ -5,13 +5,13 @@
      (scrolled)="onScroll()">
 
     <jhi-search-input
-        class="col-md-6 col-lg-4 col-xl-3"
+        class="col-12 col-md-6 col-lg-4 col-xl-3"
         (searchInputEvent)="updateSearchInput($event)">
     </jhi-search-input>
-    <div class="col-md-6 col-lg-8 col-xl-9">
+    <div class="col-12 col-md-6 col-lg-8 col-xl-9">
         <div class="row">
             <jhi-exercise-card *ngFor="let result of results"
-                               class="card-container col-md-12 col-lg-6 col-xl-4"
+                               class="card-container col-12 col-lg-6 col-xl-4"
                                [exercise]="result"
                                (exerciseSelectionEvent)="selectExercise($event)">
             </jhi-exercise-card>
diff --git a/src/main/webapp/app/search-input/search-input.component.html b/src/main/webapp/app/search-input/search-input.component.html
index 439f05dc01745c2585364f5ba0a4beb0c9fe859a..ec025e30cce6a59dd9da9e00b0593e8b4c1c5dac 100644
--- a/src/main/webapp/app/search-input/search-input.component.html
+++ b/src/main/webapp/app/search-input/search-input.component.html
@@ -1,10 +1,9 @@
 <div class="card-container">
-    <div style="float: left; width: 100%; position: relative;">
-        <h2 class="display-4" style="float: left;" jhiTranslate="search.title">Welcome!</h2>
+    <h2 class="display-4" style="float: left; width: 100%;" jhiTranslate="search.title">Welcome!</h2>
+    <div style="width: 100%; margin-bottom: 20px;">
         <button type="button"
-                class="btn btn-outline-secondary" style="float: right; margin-top: auto; position: absolute;
-  top: 1.2rem; right: 0;"
-             (click)="showSearchUsage = !showSearchUsage"
+                class="btn btn-outline-secondary"
+                (click)="showSearchUsage = !showSearchUsage"
         >{{ (showSearchUsage ? 'search.hideUsage' : 'search.showUsage') | translate}}</button>
     </div>