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 633f8dbbd..b8b353d22 100644
--- a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html
@@ -14,17 +14,17 @@
           </div>
 
 
-          <div>
+          <div class="md-form-field">
             <mat-form-field>
               <input matInput placeholder="Hostname or IP" formControlName="ip">
             </mat-form-field>
           </div>
-          <div>
+          <div  class="md-form-field">
             <mat-form-field>
               <input matInput placeholder="Port" formControlName="port">
             </mat-form-field>
           </div>
-          <div>
+          <div  class="md-form-field">
             <mat-form-field>
               <input matInput placeholder="API Key" formControlName="apiKey">
             </mat-form-field>
@@ -38,7 +38,7 @@
           </div>
 
 
-          <div>
+          <div  class="md-form-field">
             <mat-form-field>
               <input matInput placeholder="Base Url" formControlName="subDir">
             </mat-form-field>
@@ -46,7 +46,7 @@
         </div>
         <div class="col">
 
-          <div>
+          <div  class="md-form-field">
             <mat-form-field>
               <mat-label>Quality Profiles</mat-label>
               <mat-select formControlName="defaultQualityProfile" required>
@@ -59,7 +59,7 @@
                   *ngIf="profilesRunning" class="fa fa-spinner fa-spin"></span></button></div>
           </div>
 
-          <div>
+          <div  class="md-form-field">
             <mat-form-field>
               <mat-label>Default Root Folder</mat-label>
               <mat-select formControlName="defaultRootPath" required>
@@ -72,7 +72,7 @@
                   *ngIf="rootFoldersRunning" class="fa fa-spinner fa-spin"></span></button></div>
           </div>
 
-          <div>
+          <div class="md-form-field">
             <mat-form-field>
               <mat-label>Metadata Profile</mat-label>
               <mat-select formControlName="metadataProfileId" required>
@@ -86,20 +86,20 @@
           </div>
 
 
-          <div>
+          <div class="md-form-field">
             <mat-slide-toggle formControlName="albumFolder">
               Album Folder
             </mat-slide-toggle>
           </div>
 
-          <div *ngIf="advanced" style="color:#ff761b">
+          <div class="md-form-field" *ngIf="advanced" style="color:#ff761b">
             <mat-slide-toggle formControlName="addOnly">
               Do not search
             </mat-slide-toggle>
           </div>
 
 
-          <div class="form-group">
+          <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>
@@ -107,7 +107,7 @@
           </div>
 
 
-          <div class="form-group">
+          <div class="md-form-field" >
             <div>
               <button mat-raised-button type="submit" color="primary" [disabled]="form.invalid">Submit</button>
             </div>
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 08a8035c2..b948b931f 100644
--- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
@@ -1,139 +1,116 @@
 <settings-menu></settings-menu>
-<div *ngIf="form">
+<div *ngIf="form" class="container">
     <fieldset>
         <legend>Radarr Settings</legend>
         <div style="float: right;">
-            <span style="vertical-align: top;">Advanced</span>
-            <p-inputSwitch id="customInputSwitch" [(ngModel)]="advanced"></p-inputSwitch>
-        </div>
-        <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)" style="padding-top:5%;">
-            <div class="col-md-6">
-                <div class="form-group">
-                    <div class="checkbox">
-                        <input type="checkbox" id="enable" formControlName="enabled" ng-checked="form.enabled">
-                        <label for="enable">Enable</label>
-                    </div>
-                </div>
-
-
-
-                <div class="form-group">
-                    <label for="Ip" class="control-label">Hostname or IP
-                            <i *ngIf="form.get('ip').hasError('required')" class="fa fa-exclamation-circle error-text"
-                            pTooltip="IP/Hostname is required"></i>
-                    </label>
-
-                    <input type="text" class="form-control form-control-custom " id="Ip" name="Ip" placeholder="localhost"
-                        formControlName="ip" [ngClass]="{'form-error': form.get('ip').hasError('required')}">
-                </div>
-
-                <div class="form-group">
-                    <label for="portNumber" class="control-label">Port 
-                            <i *ngIf="form.get('port').hasError('required')" class="fa fa-exclamation-circle error-text"
-                            pTooltip="Port is required"></i>
-                    </label>
 
-                    <input type="text" class="form-control form-control-custom " formControlName="port" id="portNumber"
-                        name="Port" placeholder="Port Number" [ngClass]="{'form-error': form.get('port').hasError('required')}">
-                </div>
+            <mat-slide-toggle [(ngModel)]="advanced">Advanced</mat-slide-toggle>
 
+        </div>
+        <div>
+            <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)" style="padding-top:5%;">
+                <div class="col">
 
-                <div class="form-group">
-                    <label for="ApiKey" class="control-label">API Key 
-                            <i *ngIf="form.get('apiKey').hasError('required')" class="fa fa-exclamation-circle error-text"
-                            pTooltip="Api Key is required"></i>
-                    </label>
+                    <div>
+                        <mat-slide-toggle formControlName="enabled">Enable</mat-slide-toggle>
+                    </div>
 
-                    <input type="text" class="form-control form-control-custom " [ngClass]="{'form-error': form.get('apiKey').hasError('required')}"
-                        id="ApiKey" name="ApiKey" formControlName="apiKey">
-                </div>
-                <div class="form-group">
-                    <div class="checkbox">
 
-                        <input type="checkbox" id="Ssl" name="Ssl" formControlName="ssl"><label for="Ssl">SSL</label>
+                    <div class="md-form-field">
+                        <mat-form-field>
+                            <input matInput placeholder="Hostname or IP" formControlName="ip">
+                        </mat-form-field>
+                    </div>
 
+                    <div class="md-form-field">
+                        <mat-form-field>
+                            <input matInput placeholder="Port" formControlName="port">
+                        </mat-form-field>
                     </div>
-                </div>
-                <div class="form-group">
-                    <label for="SubDir" class="control-label">Base Url</label>
-                    <div>
-                        <input type="text" class="form-control form-control-custom" formControlName="subDir" id="SubDir"
-                            name="SubDir">
+                    <div class="md-form-field">
+                        <mat-form-field>
+                            <input matInput placeholder="API Key" formControlName="apiKey">
+                        </mat-form-field>
                     </div>
-                </div>
-            </div>
-            <div class="col-md-6">
-
-                <div class="form-group">
-                    <label for="select" class="control-label">Quality Profiles
-                        <i *ngIf="form.get('defaultQualityProfile').hasError('required')" class="fa fa-exclamation-circle error-text"
-                            pTooltip="Quality Profile is required"></i>
-                    </label>
-                    <div id="profiles">
-                        <select formControlName="defaultQualityProfile" class="form-control form-control-custom  col-md-5 form-half"
-                            id="select" [ngClass]="{'form-error': form.get('defaultQualityProfile').hasError('required')}">
-                            <option *ngFor="let quality of qualities" value="{{quality.id}}">{{quality.name}}</option>
-                        </select>
-                        <button (click)="getProfiles(form)" type="button" class="btn btn-primary-outline col-md-4 col-md-push-1">Get
-                            Quality Profiles <span *ngIf="profilesRunning" class="fa fa-spinner fa-spin"> </span></button>
-                    </div>
-                </div>
-
 
-                <div class="form-group">
-                    <label for="rootFolders" class="control-label">Default Root Folders
+                    <div>
+                        <mat-slide-toggle formControlName="ssl">
+                            Enable SSL
+                        </mat-slide-toggle>
+                    </div>
 
-                        <i *ngIf="form.get('defaultRootPath').hasError('required')" class="fa fa-exclamation-circle error-text"
-                            pTooltip="Root Path is required"></i>
-                    </label>
-                    <div id="rootFolders">
-                        <select formControlName="defaultRootPath" class="form-control form-control-custom col-md-5 form-half"
-                            [ngClass]="{'form-error': form.get('defaultRootPath').hasError('required')}">
-                            <option *ngFor="let folder of rootFolders" value="{{folder.path}}">{{folder.path}}</option>
-                        </select>
-                        <button (click)="getRootFolders(form)" type="button" class="btn btn-primary-outline col-md-4 col-md-push-1">Get
-                            Root Folders <span *ngIf="rootFoldersRunning" class="fa fa-spinner fa-spin"></span></button>
 
+                    <div class="md-form-field">
+                        <mat-form-field>
+                            <input matInput placeholder="Base Url" formControlName="subDir">
+                        </mat-form-field>
                     </div>
                 </div>
+                <div class="col">
+
+                    <div class="md-form-field">
+                        <mat-form-field>
+                            <mat-label>Quality Profiles</mat-label>
+                            <mat-select formControlName="defaultQualityProfile" required>
+                                <mat-option *ngFor="let quality of qualities" [value]="quality.id">
+                                    {{quality.name}}
+                                </mat-option>
+                            </mat-select>
+                        </mat-form-field>
+                        <div><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>
+                            <mat-label>Default Root Folder</mat-label>
+                            <mat-select formControlName="defaultRootPath" required>
+                                <mat-option *ngFor="let folder of rootFolders" [value]="folder.path">
+                                    {{folder.path}}
+                                </mat-option>
+                            </mat-select>
+                        </mat-form-field>
+                        <div><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="form-group">
-                    <label for="rootFolders" class="control-label">Default Minimum Availability
-                        <i *ngIf="form.get('minimumAvailability').hasError('required')" class="fa fa-exclamation-circle error-text"
-                            pTooltip="Minimum Availability is required"></i>
-                    </label>
-                    <div id="rootFolders">
-                        <select formControlName="minimumAvailability" class="form-control form-control-custom col-md-5 form-half"
-                            [ngClass]="{'form-error': form.get('minimumAvailability').hasError('required')}">
-                            <option *ngFor="let min of minimumAvailabilityOptions" value="{{min.value}}">{{min.name}}</option>
-                        </select>
+                    <div class="md-form-field">
+                        <mat-form-field>
+                            <mat-label>Default Minimum Availability</mat-label>
+                            <mat-select formControlName="minimumAvailability" required>
+                                <mat-option *ngFor="let min of minimumAvailabilityOptions" [value]="min.value">
+                                    {{min.name}}
+                                </mat-option>
+                            </mat-select>
+                        </mat-form-field>
                     </div>
+
                 </div>
-            </div>
-<div class="col-md-6">
-                <div class="form-group" *ngIf="advanced" style="color:#ff761b">
-                    <div class="checkbox">
-                        <input type="checkbox" id="addOnly" formControlName="addOnly">
-                        <label for="addOnly">Do not search</label>
+                <div class="col">
+
+                    <div class="md-form-field" *ngIf="advanced" style="color:#ff761b">
+                        <mat-slide-toggle formControlName="addOnly">
+                            Do not search
+                        </mat-slide-toggle>
                     </div>
-                </div>
 
-                <div class="form-group">
-                    <div>
-                        <button type="button" [disabled]="form.invalid" (click)="test(form)" class="btn btn-primary-outline">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>
 
 
-                <div class="form-group">
-                    <div>
-                        <button type="submit" [disabled]="form.invalid" class="btn btn-primary-outline ">Submit</button>
+                    <div class="md-form-field">
+                        <div>
+                            <button mat-raised-button type="submit" color="primary" [disabled]="form.invalid">Submit</button>
+                        </div>
                     </div>
+
                 </div>
-            </div>
-        </form>
+            </form>
+        </div>
     </fieldset>
 </div>
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/styles/_imports.scss b/src/Ombi/ClientApp/src/styles/_imports.scss
index dc88a4178..8897ace2e 100644
--- a/src/Ombi/ClientApp/src/styles/_imports.scss
+++ b/src/Ombi/ClientApp/src/styles/_imports.scss
@@ -1,3 +1,4 @@
 @import "./shared.scss";
 @import "./buttons.scss";
-@import "./primeng-overrides.scss" 
\ No newline at end of file
+@import "./primeng-overrides.scss";
+@import "./material-overrides.scss";
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/styles/material-overrides.scss b/src/Ombi/ClientApp/src/styles/material-overrides.scss
new file mode 100644
index 000000000..bed758802
--- /dev/null
+++ b/src/Ombi/ClientApp/src/styles/material-overrides.scss
@@ -0,0 +1,7 @@
+.lg-form-field .mat-form-field-infix {
+   width: 480px;
+}
+
+.md-form-field .mat-form-field-infix {
+   width: 380px;
+}
\ No newline at end of file