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 e18b42fd1..6e3dc6720 100644
--- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html
@@ -2,168 +2,171 @@
 <div *ngIf="form" class="small-middle-container">
     <fieldset>
         <legend>Sonarr Settings</legend>
-        <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)" style="padding-top:3%;">
-            <div style="float: right;">
-                <span style="vertical-align: top;">Advanced</span>
-                <p-inputSwitch id="customInputSwitch" [(ngModel)]="advanced" [ngModelOptions]="{standalone: true}"></p-inputSwitch>
-            </div>
-
-            <div class="col-md-6" style="display:block;">
-                <div class="col-md-4">
-                    <div class="form-group">
-                        <div class="checkbox">
-                            <input type="checkbox" id="enable" formControlName="enabled">
-                            <label for="enable">Enable</label>
+        <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
+            <div class="row">
+                <div class="col-md-12 col-12 col-sm-12" style="float: right; width:100%; text-align:right;">
+                    <div style="float:right;text-align:left;">
+                        <div class="md-form-field">
+                            <mat-slide-toggle formControlName="v3">V3</mat-slide-toggle>
+                        </div>
+                        <div class="md-form-field">
+                            <mat-slide-toggle formControlName="ssl">SSL</mat-slide-toggle>
                         </div>
                     </div>
-                </div>
-
-                <div class="col-md-4">
-                    <div class="form-group">
-                        <div class="checkbox">
-                            <input type="checkbox" id="v3" formControlName="v3">
-                            <label for="v3">V3</label>
+                    <div style="float: right; text-align: left; margin-left:20px;">
+                        <div class="md-form-field">
+                            <mat-slide-toggle formControlName="enabled" id="enable">Enable</mat-slide-toggle>
                         </div>
-                    </div>
-                </div>
-
-                <div class="col-md-4">
-                    <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-slide-toggle [(ngModel)]="advanced" [ngModelOptions]="{standalone: true}">Advanced</mat-slide-toggle>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="col-md-6">
-                <div class="form-group">
-                    <label for="Ip" class="control-label">Sonarr Hostname or IP 
-                        
-                        <i *ngIf="form.get('ip').hasError('required')" class="fa fa-exclamation-circle error-text" pTooltip="The IP/Hostname is required"></i>
-                    </label>
+            <div class="row">
+                <div class="col-md-7 col-8 col-sm-12">
+                    <div class="md-form-field">
+                        <mat-form-field appearance="outline" floatLabel=auto>
+                            <mat-label>Sonarr Hostname or IP</mat-label>
+                            <input matInput id="Ip" name="Ip" placeholder="Example: localhost" formControlName="ip">
+                            <mat-error>The IP/Hostname is required</mat-error>
+                        </mat-form-field>
+                    </div>
 
-                    <input type="text" class="form-control form-control-custom " formControlName="ip" id="Ip" name="Ip" placeholder="localhost" [ngClass]="{'form-error': form.get('ip').hasError('required')}">
-                </div>
+                    <div class="md-form-field">
+                        <mat-form-field appearance="outline" floatLabel=auto>
+                            <mat-label>Port</mat-label>
+                            <input matInput id="port" name="port" placeholder="Example: 8989" formControlName="port">
+                            <mat-error>The Port is required</mat-error>
+                        </mat-form-field>
+                    </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="The Port is required"></i>
-                    </label>
+                    <div class="md-form-field">
+                        <mat-form-field appearance="outline" floatLabel=auto>
+                            <mat-label>Sonarr API Key</mat-label>
+                            <input matInput id="apiKey" name="apiKey" placeholder="API Key" formControlName="apiKey">
+                            <mat-error>The API Key is required</mat-error>
+                        </mat-form-field>
+                    </div>
 
-                    <input type="text" class="form-control form-control-custom " [ngClass]="{'form-error': form.get('port').hasError('required')}" formControlName="port" id="portNumber" name="Port" placeholder="Port Number">
-                </div>
-
-
-                <div class="form-group">
-                    <label for="ApiKey" class="control-label">Sonarr API Key
-                        
-                        <i *ngIf="form.get('apiKey').hasError('required')" class="fa fa-exclamation-circle error-text" pTooltip="The API Key is required"></i>
-                    </label>
-
-                    <input type="text" class="form-control form-control-custom " [ngClass]="{'form-error': form.get('apiKey').hasError('required')}" formControlName="apiKey" id="ApiKey" name="ApiKey">
-                </div>
-                <div class="form-group">
-                    <label for="SubDir" class="control-label">Sonarr 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 appearance="outline" floatLabel=auto>
+                            <mat-label>Sonarr Base URL</mat-label>
+                            <input matInput id="SubDir" name="SubDir" placeholder="Example: /sonarr" formControlName="subDir">
+                        </mat-form-field>
                     </div>
                 </div>
-            </div>
-            <div class="col-md-5">
+                <div class="col-md-5 col-4 col-sm-12">
 
-                <div class="form-group col-md-12">
-                    <label for="profiles" class="control-label">Quality Profiles
-                            <i *ngIf="form.get('qualityProfile').hasError('required')" class="fa fa-exclamation-circle error-text" pTooltip="A Default Quality Profile is required"></i>
+                    <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>
+                                    <mat-select formControlName="qualityProfile">
+                                      <mat-option *ngFor="let quality of qualities" value="{{quality.id}}">{{quality.name}} </mat-option>
+                                    </mat-select>
+                                    <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" style="display:contents;">
+                                <mat-form-field appearance="outline">
+                                    <mat-label>Quality Profiles (Anime)</mat-label>
+                                    <mat-select formControlName="qualityProfileAnime">
+                                    <mat-option *ngFor="let quality of qualities" value="{{quality.id}}">{{quality.name}} </mat-option>
+                                    </mat-select>
+                                    <mat-error>A Default Quality Profile is required</mat-error>
+                                </mat-form-field>
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div class="form-group col-md-12">
+                        <div id="rootFolders">
+                            <div class="md-form-field" style="display:contents;">
+                                <mat-form-field appearance="outline">
+                                    <mat-label>Default Root Folders</mat-label>
+                                    <mat-select formControlName="rootPath">
+                                      <mat-option *ngFor="let folder of rootFolders" value="{{folder.id}}">{{folder.path}} </mat-option>
+                                    </mat-select>
+                                    <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;">
+                            <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>
+                        </div>
+                        <div id="rootFoldersAnime">
+                            <div class="md-form-field" style="display:contents;">
+                                <mat-form-field appearance="outline">
+                                    <mat-label>Default Root Folders (Anime)</mat-label>
+                                    <mat-select formControlName="rootPathAnime">
+                                      <mat-option *ngFor="let folder of rootFoldersAnime" value="{{folder.id}}">{{folder.path}} </mat-option>
+                                    </mat-select>
+                                    <mat-error>A Default Root Folder (Anime) is required</mat-error>
+                                  </mat-form-field>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group  col-md-12" *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>
-                    <div id="profiles">
-                        <select class="form-control form-control-custom  col-md-5 form-half" [ngClass]="{'form-error': form.get('qualityProfile').hasError('required')}" id="select" formControlName="qualityProfile">
-                                <option *ngFor="let quality of qualities" value="{{quality.id}}">{{quality.name}}</option>
-                            </select>
-                        <button type="button" (click)="getProfiles(form)" class="btn btn-primary-outline col-md-4 col-md-push-1 load">
-                                Load Qualities <span *ngIf="profilesRunning" class="fa fa-spinner fa-spin"></span></button>
-
+                        <div id="langaugeProfile">
+                            <div class="md-form-field" style="display:contents;">
+                                <mat-form-field appearance="outline">
+                                    <mat-label>Language Profiles </mat-label>
+                                    <mat-select formControlName="languageProfile">
+                                      <mat-option *ngFor="let lang of languageProfiles" value="lang.id">{{lang.name}}</mat-option>
+                                    </mat-select>
+                                    <mat-error>A Language Profile is required</mat-error>
+                                  </mat-form-field>
+                            </div>
+                            <div class="md-form-field" style="display:inline;margin-left:20px;">
+                            <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>
+                        </div>
                     </div>
 
-                </div>
 
-
-                <div class="form-group col-md-12">
-                    <label for="select" class="control-label">Quality Profiles (Anime)</label>
-                    <div id="qualityProfileAnime">
-                        <select class="form-control form-control-custom  col-md-5 form-half" id="qualityProfileAnime" formControlName="qualityProfileAnime">
-                            <option *ngFor="let quality of qualities" value="{{quality.id}}">{{quality.name}}</option>
-                        </select>
-                    </div>
-                </div>
-
-
-                <div class="form-group col-md-12">
-                    <label for="rootFolders" class="control-label">Default Root Folders
-                         
-                        <i *ngIf="form.get('rootPath').hasError('required')" class="fa fa-exclamation-circle error-text" pTooltip="A Default Root Path is required"></i>
-                    </label>
-                    <div id="rootFolders">
-                        <select class="form-control form-control-custom  col-md-5 form-half" formControlName="rootPath" [ngClass]="{'form-error': form.get('rootPath').hasError('required')}">
-                            <option *ngFor="let folder of rootFolders" value="{{folder.id}}">{{folder.path}}</option>
-                        </select>
-                        <button type="button" (click)="getRootFolders(form)" class="btn btn-primary-outline load col-md-4 col-md-push-1">
-                            Load Folders <span *ngIf="rootFoldersRunning" class="fa fa-spinner fa-spin"></span></button>
-                    </div>
-                </div>
-
-                <div class="form-group col-md-12">
-                    <label for="rootFoldersAnime" class="control-label">Default Root Folders (Anime)</label>
-                    <div id="rootFoldersAnime">
-                        <select class="form-control form-control-custom  col-md-5 form-half" formControlName="rootPathAnime">
-                            <option *ngFor="let folder of rootFoldersAnime" value="{{folder.id}}">{{folder.path}}</option>
-                        </select>
+                    <div class="form-group col-md-12">
+                        <div class="checkbox">
+                            <input type="checkbox" id="SeasonFolders" name="SeasonFolders" formControlName="seasonFolders">
+                            <label for="SeasonFolders">Enable season folders</label>
+                        </div>
+                        <label>Enabled Season Folders to organize seasons into individual folders within a show.</label>
                     </div>
 
-                </div>
-
-                <div class="form-group  col-md-12" *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>
-                    <div id="langaugeProfile">
-                        <select formControlName="languageProfile" class="form-control form-control-custom  col-md-5 form-half" id="select" [ngClass]="{'form-error': form.get('languageProfile').hasError('required')}">
-                            <option *ngFor="let lang of languageProfiles" [ngValue]="lang.id">{{lang.name}}</option>
-                        </select>
-                        <button (click)="getLanguageProfiles(form)" type="button" class="btn btn-primary-outline col-md-4 col-md-push-1">Load
-                            Languages <span *ngIf="langRunning" class="fa fa-spinner fa-spin"> </span></button>
-
+                    <div class="form-group col-md-12" *ngIf="advanced" style="color:#ff761b">
+                        <div class="checkbox">
+                            <input type="checkbox" id="addOnly" formControlName="addOnly">
+                            <label for="addOnly">Do not search</label>
+                        </div>
                     </div>
                 </div>
-
-
-                <div class="form-group col-md-12">
-                    <div class="checkbox">
-                        <input type="checkbox" id="SeasonFolders" name="SeasonFolders" formControlName="seasonFolders">
-                        <label for="SeasonFolders">Enable season folders</label>
+                <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>
                     </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="checkbox">
-                        <input type="checkbox" id="addOnly" formControlName="addOnly">
-                        <label for="addOnly">Do not search</label>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-4">
-                <div class="form-group col-md-7">
-                    <div>
-                        <button type="submit" class="btn btn-primary-outline ">Submit</button>
-                    </div>
-                </div>
-
-                <div class="form-group col-md-7">
-                    <div>
-                        <button type="button" (click)="test(form)" class="btn btn-primary-outline">Test Connectivity
-                        <span id="spinner"> </span></button>
+                    <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>
                     </div>
                 </div>
             </div>
diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.scss b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.scss
index 2d51f1403..dd9ab640e 100644
--- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.scss
+++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.scss
@@ -5,29 +5,11 @@
     margin-top: 10px;
 }
 
-.col-md-6 {
-    display: contents;
+.col-8 {
+    display: inline-table;
 }
-
 .col-md-5 {
-    display: contents;
-}
-
-.col-md-4 {
-    display: contents;
-}
-
-.control-label {
-    font-weight: 400;
-}
-
-.row {
-    display: block;
-}
-
-::ng-deep .dark .btn:hover {
-    box-shadow: 0 5px 11px 0 rgba(255, 255, 255, 0.18), 0 4px 15px 0 rgba(255, 255, 255, 0.15);
-    color: inherit;
+    display: inline-table;
 }
 
 ::ng-deep .load {
@@ -35,15 +17,3 @@
     margin-left: 3em;
     padding: 0.5rem 1.14rem;
 }
-
-@media (min-width:1440px) {
-    .col-md-6 {
-        display: inline-table;
-    }
-    .col-md-5 {
-        display: inline-table;
-    }
-    .col-md-4 {
-        display: inline-table;
-    }
-}
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts
index ec044d9e3..c4cb0d920 100644
--- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms";
 
 import { ILanguageProfiles, ISonarrProfile, ISonarrRootFolder } from "../../interfaces";
 
@@ -28,12 +28,32 @@ export class SonarrComponent implements OnInit {
     public langRunning: boolean;
     public form: FormGroup;
     public advanced = false;
+    formErrors: any;
 
     constructor(private settingsService: SettingsService,
                 private sonarrService: SonarrService,
                 private notificationService: NotificationService,
                 private testerService: TesterService,
-                private fb: FormBuilder) { }
+                private fb: FormBuilder){}
+
+    onFormValuesChanged()
+        {
+            for ( const field in this.formErrors )
+            {
+                if ( !this.formErrors.hasOwnProperty(field) )
+                {
+                    continue;
+                }
+                // Clear previous errors
+                this.formErrors[field] = {};
+                // Get the control
+                const control = this.form.get(field);
+                if ( control && control.dirty && !control.valid && control.value === "Please Select")
+                    {
+                        this.formErrors[field] = control.errors;
+                    }
+            }
+        }
 
     public ngOnInit() {
         this.settingsService.getSonarr()
@@ -41,8 +61,8 @@ export class SonarrComponent implements OnInit {
                 this.form = this.fb.group({
                     enabled: [x.enabled],
                     apiKey: [x.apiKey, [Validators.required]],
-                    qualityProfile: [x.qualityProfile, [Validators.required]],
-                    rootPath: [x.rootPath, [Validators.required]],
+                    qualityProfile: [x.qualityProfile, [Validators.required, validateProfile]],
+                    rootPath: [x.rootPath, [Validators.required, validateProfile]],
                     qualityProfileAnime: [x.qualityProfileAnime],
                     rootPathAnime: [x.rootPathAnime],
                     ssl: [x.ssl],
@@ -67,6 +87,16 @@ export class SonarrComponent implements OnInit {
                 if(x.v3) {
                     this.form.controls.languageProfile.setValidators([Validators.required]);
                 }
+
+                this.formErrors ={
+                    apiKey: {},
+                    qualityProfile: {},
+                    rootPath: {},
+                    ip: {},
+                    port: {},
+                    
+                };
+                this.onFormValuesChanged();
             });
         this.rootFolders = [];
         this.qualities = [];
@@ -81,9 +111,8 @@ export class SonarrComponent implements OnInit {
         this.sonarrService.getQualityProfiles(form.value)
             .subscribe(x => {
                 this.qualities = x;
-                this.qualities.unshift({ name: "Please Select", id: -1 });
                 this.qualitiesAnime = x;
-
+                this.qualities.unshift({ name: "Please Select", id: -1 });
                 this.profilesRunning = false;
                 this.notificationService.success("Successfully retrieved the Quality Profiles");
             });
@@ -155,3 +184,10 @@ export class SonarrComponent implements OnInit {
             });
     }
 }
+function validateProfile(qualityProfile): { [key: string]:boolean } | null {
+
+    if (qualityProfile.value !== undefined && (isNaN(qualityProfile.value) || qualityProfile.value == -1)) {
+        return { 'profileValidation': true };
+    }
+    return null;
+}
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/styles/shared.scss b/src/Ombi/ClientApp/src/styles/shared.scss
index 01bc723ff..c5ba4ee07 100644
--- a/src/Ombi/ClientApp/src/styles/shared.scss
+++ b/src/Ombi/ClientApp/src/styles/shared.scss
@@ -104,4 +104,12 @@ table {
 
 ::ng-deep .mat-toolbar.mat-primary{
     margin-bottom: 0.5em;
+}
+
+::ng-deep .dark .mat-form-field.mat-focused .mat-form-field-label{
+    color: $accent-dark;
+}
+
+::ng-deep .mat-form-field.mat-focused .mat-form-field-label{
+    color: $accent;
 }
\ No newline at end of file