diff --git a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html
index d7ecd3272..c3bc85fcb 100644
--- a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html
@@ -1,4 +1,4 @@
-<settings-menu></settings-menu>
+<settings-menu></settings-menu>
   <div *ngIf="form" class="small-middle-container">
     <fieldset>
       <legend>Lidarr Settings</legend>
@@ -6,7 +6,7 @@
       <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
 
         <div class="row">
-          <div class="col-md-12 col-12 col-sm-12"></div>
+          <div class="col-md-12 col-12 col-sm-12">
           <div class="md-form-field">
             <mat-slide-toggle formControlName="enabled">Enable</mat-slide-toggle>
           </div>
@@ -14,18 +14,18 @@
             <mat-slide-toggle [ngModelOptions]="{standalone: true}" [(ngModel)]="advanced">Advanced</mat-slide-toggle>
           </div>
         </div>
-
+        </div>
         <div class="row">
           <div class="col-md-7 col-8 col-sm-12">
             <label for="username" class="control-label">
               <h3>Server Configuration</h3>
             </label>
             <div class="md-form-field">
-              <mat-form-field appearance="outline">
+              <mat-form-field appearance="outline" floatLabel=always>
                 <mat-label>Hostname or IP</mat-label>
                 <input matInput formControlName="ip">
               </mat-form-field>
-              <mat-form-field appearance="outline">
+              <mat-form-field appearance="outline" floatLabel=always>
                 <mat-label>Port</mat-label>
                 <input matInput formControlName="port">
               </mat-form-field>
@@ -34,13 +34,13 @@
               </mat-slide-toggle>
             </div>
             <div class="md-form-field">
-              <mat-form-field appearance="outline">
+              <mat-form-field appearance="outline" floatLabel=always>
                 <mat-label>API key</mat-label>
                 <input matInput formControlName="apiKey">
               </mat-form-field>
             </div>
             <div class="md-form-field">
-              <mat-form-field appearance="outline">
+              <mat-form-field appearance="outline" floatLabel=always>
                 <mat-label>Base URL</mat-label>
                 <input matInput formControlName="subDir">
               </mat-form-field>
@@ -52,7 +52,7 @@
               <h3>Interface</h3>
             </label>
             <div class="md-form-field">
-              <mat-form-field appearance="outline">
+              <mat-form-field appearance="outline" floatLabel=always>
                 <mat-label>Quality Profiles</mat-label>
                 <mat-select formControlName="defaultQualityProfile" required>
                   <mat-option *ngFor="let quality of qualities" [value]="quality.id">
@@ -60,14 +60,14 @@
                   </mat-option>
                 </mat-select>
               </mat-form-field>
-              <div class="md-form-field" style="display:inline;margin-left:20px;">
+              <div class="md-form-field" style="display:inline;">
                 <button mat-raised-button (click)="getProfiles(form)" color="primary">Load Profiles <span
                     *ngIf="profilesRunning" class="fa fa-spinner fa-spin"></span></button>
               </div>
             </div>
 
             <div class="md-form-field">
-              <mat-form-field appearance="outline">
+              <mat-form-field appearance="outline" floatLabel=always>
                 <mat-label>Default Root Folder</mat-label>
                 <mat-select formControlName="defaultRootPath" required>
                   <mat-option *ngFor="let folder of rootFolders" [value]="folder.path">
@@ -75,14 +75,14 @@
                   </mat-option>
                 </mat-select>
               </mat-form-field>
-              <div class="md-form-field" style="display:inline;margin-left:20px;">
+              <div class="md-form-field" style="display:inline;">
                 <button mat-raised-button (click)="getRootFolders(form)" color="primary">Load Root Folders <span
                     *ngIf="rootFoldersRunning" class="fa fa-spinner fa-spin"></span></button>
               </div>
             </div>
 
             <div class="md-form-field">
-              <mat-form-field appearance="outline">
+              <mat-form-field appearance="outline" floatLabel=always>
                 <mat-label>Metadata Profile</mat-label>
                 <mat-select formControlName="metadataProfileId" required>
                   <mat-option *ngFor="let folder of metadataProfiles" [value]="folder.id">
@@ -90,7 +90,7 @@
                   </mat-option>
                 </mat-select>
               </mat-form-field>
-              <div class="md-form-field" style="display:inline;margin-left:20px;">
+              <div class="md-form-field" style="display:inline;">
                 <button mat-raised-button (click)="getMetadataProfiles(form)" color="primary">Load Metadata <span
                     *ngIf="metadataRunning" class="fa fa-spinner fa-spin"></span></button></div>
             </div>
@@ -112,19 +112,18 @@
         </div>
         <div class="row">
           <div class="col-12">
-            <div class="md-form-field">
-              <div>
-                <button mat-raised-button type="button" [disabled]="form.invalid" (click)="test(form)">Test
-                  Connectivity <span id="spinner"></span></button>
+              <div class="md-form-field">
+                  <div>
+                      <button mat-raised-button type="button" [disabled]="form.invalid" (click)="test(form)">Test Connectivity <span id="spinner"></span></button>
+                  </div>
+                  </div>
+                  <div class="md-form-field" style="margin-top:1em;">
+                  <div>
+                      <button mat-raised-button type="submit" color="primary" [disabled]="form.invalid" class="mat-focus-indicator mat-stroked-button accent mat-accent mat-raised-button mat-button-base" ng-reflect-disabled="false"><span class="mat-button-wrapper">Submit</span><div matripple="" class="mat-ripple mat-button-ripple" ng-reflect-disabled="false" ng-reflect-centered="false" ng-reflect-trigger="[object HTMLButtonElement]"></div><div class="mat-button-focus-overlay"></div></button>
+                  </div>
               </div>
-            </div>
-            <div class="md-form-field">
-              <div>
-                <button mat-raised-button type="submit" color="primary" [disabled]="form.invalid">Submit</button>
-              </div>
-            </div>
           </div>
-        </div>
-      </form>
-    </fieldset>
-  </div>
\ No newline at end of file
+      </div>
+  </form>
+</fieldset>
+</div>
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
index cc17543b0..5e9a56b3b 100644
--- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
@@ -20,7 +20,7 @@
             </div>
             <div class="row">
                 <div class="col-md-7 col-8 col-sm-12">
-                    <label for="username" class="control-label"><h3>Server Configuration</h3></label>
+                    <label for="username" class="control-label"><h3>Radarr Server Configuration</h3></label>
                     <div class="md-form-field">
                         <mat-form-field appearance="outline" >
                             <mat-label>Hostname or IP</mat-label>
@@ -48,7 +48,7 @@
                     </div>
                 </div>
                 <div class="col-md-5 col-4 col-sm-12">
-                    <label for="username" class="control-label"><h3>Interface</h3></label>
+                    <label for="username" class="control-label"><h3>Radarr Interface</h3></label>
                     <div class="md-form-field">
                         <mat-form-field appearance="outline" >
                             <mat-label>Quality Profiles</mat-label>
@@ -58,7 +58,7 @@
                                 </mat-option>
                             </mat-select>
                         </mat-form-field>
-                        <div class="md-form-field" style="display:inline;margin-left:20px;">
+                        <div class="md-form-field" style="display:inline;">
                             <button mat-raised-button (click)="getProfiles(form)" color="primary">Load Profiles <span *ngIf="profilesRunning" class="fa fa-spinner fa-spin"></span></button>
                         </div>
                     </div>
@@ -71,7 +71,7 @@
                                 </mat-option>
                             </mat-select>
                         </mat-form-field>
-                        <div class="md-form-field" style="display:inline;margin-left:20px;">
+                        <div class="md-form-field" style="display:inline;">
                             <button mat-raised-button (click)="getRootFolders(form)" color="primary">Load Root Folders <span *ngIf="rootFoldersRunning" class="fa fa-spinner fa-spin"></span></button>
                         </div>
                     </div>
@@ -95,14 +95,10 @@
             <div class="row">
                 <div class="col-12">
                     <div class="md-form-field">
-                        <div>
                             <button mat-raised-button type="button" [disabled]="form.invalid" (click)="test(form)">Test Connectivity <span id="spinner"></span></button>
                         </div>
-                        </div>
                         <div class="md-form-field" style="margin-top:1em;">
-                        <div>
-                            <button mat-raised-button type="submit" color="primary" [disabled]="form.invalid">Submit</button>
-                        </div>
+                            <button mat-raised-button type="submit" color="primary" [disabled]="form.invalid" class="mat-focus-indicator mat-stroked-button accent mat-accent mat-raised-button mat-button-base" ng-reflect-disabled="false"><span class="mat-button-wrapper">Submit</span><div matripple="" class="mat-ripple mat-button-ripple" ng-reflect-disabled="false" ng-reflect-centered="false" ng-reflect-trigger="[object HTMLButtonElement]"></div><div class="mat-button-focus-overlay"></div></button>   
                     </div>
                 </div>
             </div>
diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html
index ac5327c5f..60ddf9827 100644
--- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html
@@ -56,8 +56,6 @@
                 </div>
                 <div class="col-md-5 col-4 col-sm-12">
                     <label for="username" class="control-label"><h3>Sonarr Interface</h3></label>
-                    <div class="form-group col-md-12">
-                        <div id="profiles">
                             <div class="md-form-field" style="display:contents;">
                                 <mat-form-field appearance="outline">
                                     <mat-label>Quality Profiles</mat-label>
@@ -67,12 +65,7 @@
                                     <mat-error>A Default Quality Profile is required</mat-error>
                                   </mat-form-field>
                             </div>
-                            <div class="md-form-field" style="display:inline;margin-left:20px;">
-                            <button mat-raised-button id="profiles" (click)="getProfiles(form)" class="mat-stroked-button load">
-                                    Load Qualities <span *ngIf="profilesRunning" class="fa fa-spinner fa-spin"></span></button>
-                            </div>
-                        </div>
-                        <div id="qualityProfileAnime">
+                        <div class="md-form-field" id="qualityProfileAnime">
                             <div class="md-form-field" style="display:contents;">
                                 <mat-form-field appearance="outline">
                                     <mat-label>Quality Profiles (Anime)</mat-label>
@@ -81,12 +74,17 @@
                                     </mat-select>
                                     <mat-error>A Default Quality Profile is required</mat-error>
                                 </mat-form-field>
+                                <div class="md-form-field" style="display:inline;">
+                                    <button mat-raised-button id="profiles" (click)="getProfiles(form)" class="mat-stroked-button load">
+                                            Load Qualities <span *ngIf="profilesRunning" class="fa fa-spinner fa-spin"></span></button>
+                                    </div>
+                                    </div>
                             </div>
                         </div>
                     </div>
 
 
-                    <div class="form-group col-md-12">
+                    <div class="md-form-field">
                         <div id="rootFolders">
                             <div class="md-form-field" style="display:contents;">
                                 <mat-form-field appearance="outline">
@@ -97,7 +95,7 @@
                                     <mat-error>A Default Root Folder is required</mat-error>
                                   </mat-form-field>
                             </div>
-                            <div class="md-form-field" style="display:inline;margin-left:20px;">
+                            <div class="md-form-field" style="display:inline;">
                             <button mat-raised-button id="rootFolder" (click)="getRootFolders(form)" class="mat-stroked-button load">
                                 Load Folders <span *ngIf="rootFoldersRunning" class="fa fa-spinner fa-spin"></span></button>
                             </div>
@@ -116,7 +114,7 @@
 
                     </div>
 
-                    <div class="form-group  col-md-12" *ngIf="form.controls.v3.value">
+                    <div class="md-form-field" *ngIf="form.controls.v3.value">
                         <label for="select" class="control-label">Language Profiles 
                             <i *ngIf="form.get('languageProfile').hasError('required')" class="fa fa-exclamation-circle error-text" pTooltip="A Language Profile is required"></i>
                         </label>
@@ -130,7 +128,7 @@
                                     <mat-error>A Language Profile is required</mat-error>
                                   </mat-form-field>
                             </div>
-                            <div class="md-form-field" style="display:inline;margin-left:20px;">
+                            <div class="md-form-field" style="display:inline;">
                             <button type="button" mat-raised-button (click)="getLanguageProfiles(form)" class="mat-stroked-button load">Load
                                 Languages <span *ngIf="langRunning" class="fa fa-spinner fa-spin"> </span></button>
                             </div>
@@ -138,34 +136,29 @@
                     </div>
 
 
-                    <div class="form-group col-md-12">
+                    <div class="md-form-field">
                         <div class="checkbox">
                             <mat-slide-toggle id="SeasonFolders" name="SeasonFolders" formControlName="seasonFolders">Enable season folders</mat-slide-toggle>
                         </div>
                         <label>Enabled Season Folders to organize seasons into individual folders within a show.</label>
                     </div>
 
-                    <div class="form-group col-md-12" *ngIf="advanced" style="color:#ff761b">
+                    <div class="md-form-field" *ngIf="advanced" style="color:#ff761b">
                         <div class="checkbox">
                             <mat-slide-toggle id="addOnly" formControlName="addOnly">Do not search</mat-slide-toggle>
                         </div>
                     </div>
-                </div>
-                <div class="col-md-4">
-                    <div class="form-group col-md-7">
-                        <div>
-                            <button mat-raised-button type="submit" class="mat-stroked-button accent mat-accent">Submit</button>
+                
+                <div class="row">
+                    <div class="col-12">
+                        <div div class="md-form-field">
+                            <button mat-raised-button type="button" [disabled]="form.invalid" (click)="test(form)">Test Connectivity <span id="spinner"></span></button>
                         </div>
-                    </div>
-
-                    <div class="form-group col-md-7">
-                        <div>
-                            <button mat-raised-button type="button" (click)="test(form)" class="mat-stroked-button">Test Connectivity
-                            <span id="spinner"> </span></button>
+                        <div class="md-form-field" style="margin-top:1em;">
+                            <button mat-raised-button type="submit" color="primary" [disabled]="form.invalid" class="mat-focus-indicator mat-stroked-button accent mat-accent mat-raised-button mat-button-base" ng-reflect-disabled="false"><span class="mat-button-wrapper">Submit</span><div matripple="" class="mat-ripple mat-button-ripple" ng-reflect-disabled="false" ng-reflect-centered="false" ng-reflect-trigger="[object HTMLButtonElement]"></div><div class="mat-button-focus-overlay"></div></button>
                         </div>
                     </div>
                 </div>
-            </div>
         </form>
     </fieldset>
 </div>
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
index f4e19cb93..d65dd377e 100644
--- a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
@@ -73,13 +73,13 @@
         </div>
 
     </div>
-    <div class="col-md-6">
-        <div class="form-group">
-            <button type="submit" id="save" (click)="submit()" class="btn btn-primary-outline">Submit</button>
-            <button type="button" [disabled]="!enableImportButton" (click)="runImporter()" class="btn btn-info-outline">Run Importer</button>
-        </div>     
+    <div class="col-12">
         <div class="form-group">
+            <button (click)="submit()" mat-raised-button="" type="submit" id="save" class="mat-focus-indicator mat-stroked-button accent mat-accent mat-raised-button mat-button-base" ng-reflect-disabled="false"><span class="mat-button-wrapper">Submit</span><div matripple="" class="mat-ripple mat-button-ripple" ng-reflect-disabled="false" ng-reflect-centered="false" ng-reflect-trigger="[object HTMLButtonElement]"></div><div class="mat-button-focus-overlay"></div></button>
         </div>
+        <div><button type="button" [disabled]="!enableImportButton" (click)="runImporter()" class="mat-focus-indicator mat-stroked-button mat-raised-button mat-button-base">Run Importer<div matripple="" class="mat-ripple mat-button-ripple" ng-reflect-disabled="false" ng-reflect-centered="false" ng-reflect-trigger="[object HTMLButtonElement]"></div><div class="mat-button-focus-overlay"></div></button>
+        </div>     
     </div>
 </fieldset>
+<div class="md-form-field" style="margin-top:1em;"></div>
 </div>
\ No newline at end of file