diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
index 777f4820e..2997cda3c 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
@@ -1,63 +1,68 @@
-<div>
-    <span *ngIf="tv.rating">
-        <img style="width: 4em;" src="{{baseUrl}}/images/tvm-logo.png"> {{tv.rating}}/10
-    </span>
-    <span *ngIf="ratings?.score && ratings?.class">
-        <img class="rating-small" src="{{baseUrl}}/images/{{ratings.class === 'rotten' ? 'rotten-rotten.svg' : 'rotten-fresh.svg'}}"> {{ratings.score}}%
-    </span>
-
-    <div *ngIf="streams?.length > 0">
+<div class="left-panel-details">
+    <div>
+        <div class="rating medium-font">
+            <span *ngIf="tv.rating">
+                <img class="rating-small" src="{{baseUrl}}/images/tvm-logo.png"> {{tv.rating}}/10
+            </span>
+            <span *ngIf="ratings?.score && ratings?.class">
+                <img class="rating-small" src="{{baseUrl}}/images/{{ratings.class === 'rotten' ? 'rotten-rotten.svg' : 'rotten-fresh.svg'}}"> {{ratings.score}}%
+            </span>
+        </div>
+        <div *ngIf="streams?.length > 0" class="streaming-on-container">
+            <hr>
+            <div class="streaming-on-content">
+                <span class="label">{{'MediaDetails.StreamingOn' | translate }}:</span>
+                <div>
+                    <span *ngFor="let stream of streams">
+                        <img class="stream-small" [matTooltip]="stream.streamingProvider" src="https://image.tmdb.org/t/p/original{{stream.logo}}">
+                    </span>
+                </div>
+            </div>
+        </div>
         <hr>
-        <strong>{{'MediaDetails.StreamingOn' | translate }}:</strong>
-        <div>
-        <span *ngFor="let stream of streams">
-            <img class="stream-small" [matTooltip]="stream.streamingProvider" src="https://image.tmdb.org/t/p/original{{stream.logo}}">
-        </span>
+        <div *ngIf="tv.status">
+            <span class="label">{{'MediaDetails.Status' | translate }}:</span>
+                {{tv.status}}
         </div>
+        <span class="label">First Aired:</span>
+            {{tv.firstAired | date: 'mediumDate'}}
     </div>
-    <hr>
-    <div *ngIf="tv.status">
-        <strong>{{'MediaDetails.Status' | translate }}:</strong>
-            {{tv.status}}
-    </div>
-    <strong>First Aired:</strong>
-        {{tv.firstAired | date: 'mediumDate'}}
-</div>
 
-<div *ngIf="seasonCount">
-    <strong>Seasons:</strong>
-        {{seasonCount}}
-</div>
-<div *ngIf="totalEpisodes">
-    <strong>Episodes:</strong>
-        {{totalEpisodes}}
-</div>
+    <div *ngIf="seasonCount">
+        <span class="label">Seasons:</span>
+            {{seasonCount}}
+    </div>
+    <div *ngIf="totalEpisodes">
+        <span class="label">Episodes:</span>
+            {{totalEpisodes}}
+    </div>
 
-<div *ngIf="advancedOptions && request?.rootPathOverrideTitle">
-    <strong>{{'MediaDetails.RootFolderOverride' | translate }}:</strong>
-    <div>{{request.rootPathOverrideTitle}}</div>
-</div>
-<div *ngIf="advancedOptions && request?.qualityOverrideTitle">
-    <strong>{{'MediaDetails.QualityOverride' | translate }}:</strong>
-    <div>{{request.qualityOverrideTitle}}</div>
-</div>
+    <div *ngIf="advancedOptions && request?.rootPathOverrideTitle">
+        <span class="label">{{'MediaDetails.RootFolderOverride' | translate }}:</span>
+        <div>{{request.rootPathOverrideTitle}}</div>
+    </div>
+    <div *ngIf="advancedOptions && request?.qualityOverrideTitle">
+        <span class="label">{{'MediaDetails.QualityOverride' | translate }}:</span>
+        <div>{{request.qualityOverrideTitle}}</div>
+    </div>
 
-<div>
-    <strong>{{'MediaDetails.Runtime' | translate }}:</strong>
-        {{'MediaDetails.Minutes' | translate:{ runtime: tv.runtime} }}
-</div>
+    <div>
+        <span class="label">{{'MediaDetails.Runtime' | translate }}:</span>
+            {{'MediaDetails.Minutes' | translate:{ runtime: tv.runtime} }}
+    </div>
 
-<div *ngIf="tv.network">
-    <strong>Network:</strong>
-        {{tv.network.name}}
-</div>
+    <div *ngIf="tv.network">
+        <span class="label">Network:</span>
+            {{tv.network.name}}
+    </div>
 
-<div *ngIf="tv.genre">
-    <strong>{{'MediaDetails.Genres' | translate }}:</strong>
-    <div>
-        <span *ngFor="let genre of tv.genre">
-            {{genre}} |
-        </span>
+    <div *ngIf="tv.genre">
+        <span class="label">{{'MediaDetails.Genres' | translate }}:</span>
+        <div>
+            <span *ngFor="let genre of tv.genre">
+                {{genre}} |
+            </span>
+        </div>
     </div>
 </div>
 
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
index 976fcfefc..62d1b5b77 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
@@ -67,8 +67,8 @@
 
                     <div class="row">
                         <div class="col-12 col-md-2">
-                            <mat-card class="mat-elevation-z8">
-                                <mat-card-content class="medium-font">
+                            <mat-card class="mat-elevation-z8 spacing-below">
+                                <mat-card-content>
                                     <tv-information-panel [tv]="tv" [request]="showRequest"
                                         [advancedOptions]="showAdvanced"></tv-information-panel>
                                 </mat-card-content>
diff --git a/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss b/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss
index 037d9bd23..13886c0db 100644
--- a/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss
+++ b/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss
@@ -288,6 +288,18 @@
     font-weight:500;
 }
 
+.left-panel-details .streaming-on-content{
+    display:flex;
+    justify-content: center;
+    align-items: center;
+    flex-flow:row wrap;
+}
+
+.left-panel-details .streaming-on-content .label{
+    white-space:nowrap;
+    padding-right:10px;
+}
+
 .left-panel-details{
     font-weight:100;
 }
@@ -314,6 +326,7 @@
     padding:2px 1.5em;;
     width:170px;
     margin-top:10px;
+    margin-left:10px;
 }
 
 @media (max-width:500px){
@@ -330,6 +343,7 @@
 
     .media-row .mat-raised-button{
         width:100%;
+        margin-left:0px;
     }
 
     .media-row .btn-spacing{
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.component.html
index a569a6ef4..dfb047fe8 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.component.html
@@ -1,6 +1,6 @@
 <settings-menu>
 </settings-menu>
-<div *ngIf="form" class="container">
+<div *ngIf="form" class="small-middle-container">
     <fieldset>
         <legend>Mobile Notifications</legend>
 
@@ -47,7 +47,7 @@
 
             <div class="md-form-field ">
                 <div>
-                    <button mat-raised-button type="submit " color="primary" [disabled]="form.invalid ">Submit</button>
+                    <button mat-raised-button type="submit " color="accent" [disabled]="form.invalid ">Submit</button>
                 </div>
             </div>
         </form>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.coponent.ts b/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.coponent.ts
index e78860e09..3708f48a5 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.coponent.ts
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.coponent.ts
@@ -11,6 +11,7 @@ import { MatTableDataSource } from "@angular/material/table";
 
 @Component({
     templateUrl: "./cloudmobile.component.html",
+    styleUrls: ["./notificationtemplate.component.scss"]
 })
 export class CloudMobileComponent implements OnInit {
 
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.html
index 0b732fd74..9b2a7c938 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.html
@@ -42,7 +42,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
+                        <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
                             Test
                             <div id="spinner"></div>
                         </button>
@@ -53,7 +53,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                        <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
                     </div>
                 </div>
             </form>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.html
index ea18e07e5..d7998c417 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.html
@@ -47,7 +47,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
+                        <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
                             Test
                             <div id="spinner"></div>
                         </button>
@@ -58,7 +58,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                        <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
                     </div>
                 </div>
             </form>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.html
index b01a8b459..c5573c57e 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.html
@@ -3,71 +3,73 @@
 <div *ngIf="form" class="small-middle-container">
     <fieldset>
         <legend>Legacy Mobile Notifications</legend>
-        <div class="col-md-6">
-            <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
-                <div class="row">
-                    <div *ngIf="userList" class="col-md-8">
-                        <table class="table table-striped table-hover table-responsive table-condensed">
-                            <thead>
-                                <tr>
-                                    <th>
-                                        <a>Username/Alias</a>
-                                    </th>
-                                    <th>
-                                        <a>Mobile Devices Registered</a>
-                                    </th>
+        <div class="lmobile-container">
+            <div class="col-md-6">
+                <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
+                    <div class="row">
+                        <div *ngIf="userList" class="col-md-8">
+                            <table class="table table-striped table-hover table-responsive table-condensed">
+                                <thead>
+                                    <tr>
+                                        <th>
+                                            <a>Username/Alias</a>
+                                        </th>
+                                        <th>
+                                            <a>Mobile Devices Registered</a>
+                                        </th>
 
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr *ngFor="let user of userList">
-                                    <td>
-                                        {{user.username}}
-                                    </td>
-                                    <td>
-                                        {{user.devices}}
-                                    </td>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr *ngFor="let user of userList">
+                                        <td>
+                                            {{user.username}}
+                                        </td>
+                                        <td>
+                                            {{user.devices}}
+                                        </td>
 
-                            </tbody>
-                        </table>
+                                </tbody>
+                            </table>
+                        </div>
                     </div>
-                </div>
 
-                <div class="row">
-                    <div class="form-group">
-                        <label for="select" class="control-label">Users</label>
-                        <div>
-                            <select class="form-control form-control-custom" id="select" [(ngModel)]="testUserId" [ngModelOptions]="{standalone: true}">
-                                <option value="">Please select</option>    
-                                <option *ngFor="let x of userList" [value]="x.userId">{{x.username}}</option>
-                            </select>
+                    <div class="row lmobile-actions">
+                        <div class="form-group">
+                            <label for="select" class="control-label">Users</label>
+                            <div>
+                                <select class="form-control form-control-custom" id="select" [(ngModel)]="testUserId" [ngModelOptions]="{standalone: true}">
+                                    <option value="">Please select</option>    
+                                    <option *ngFor="let x of userList" [value]="x.userId">{{x.username}}</option>
+                                </select>
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <div>
-                            <button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-danger-outline">Send Test Notification</button>
+                        <div class="form-group">
+                            <div>
+                                <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-danger-outline">Send Test Notification</button>
+                            </div>
                         </div>
-                    </div>
-                    <div class="form-group">
-                        <div>
-                            <button [disabled]="form.invalid" type="button" (click)="remove(form)" class="btn btn-danger-outline">Remove User</button>
+                        <div class="form-group">
+                            <div>
+                                <button [disabled]="form.invalid" mat-raised-button type="button" (click)="remove(form)" class="btn btn-danger-outline">Remove User</button>
+                            </div>
                         </div>
-                    </div>
 
 
-                    <div class="form-group">
-                        <div>
-                            <button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                        <div class="form-group">
+                            <div>
+                                <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                            </div>
                         </div>
                     </div>
-                </div>
-            </form>
-        </div>
+                </form>
+            </div>
 
 
-        <div class="col-md-6">
-            <notification-templates [templates]="templates" [showSubject]="false"></notification-templates>
+            <div class="col-md-6 issue-content">
+                <notification-templates [templates]="templates" [showSubject]="false"></notification-templates>
+            </div>
         </div>
     </fieldset>
 </div>
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.scss b/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.scss
index 33f8a2d6c..1ffd9207b 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.scss
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.scss
@@ -1,15 +1,30 @@
 @import "~styles/shared.scss";
-::ng-deep ngb-accordion > div.card {
-    color:white;
-    padding-top: 0px;
-}
-
-::ng-deep ngb-accordion > div.card >  div.card-header {
-    padding:0px;
-}
 
 .small-middle-container{
 	margin: auto;
 	width: 95%;
 	margin-top:10px;
+}
+
+.lmobile-actions{
+    display:flex;
+    justify-content: left;
+    align-items:flex-end;
+}
+
+.lmobile-actions .form-group{
+    margin-right:10px;
+}
+
+.lmobile-container{
+    display:flex;
+    margin-top:10px;
+}
+
+.issue-content{
+    justify-content: flex-end;
+}
+
+.mat-raised-button{
+    margin-right:10px;
 }
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.html
index 3c4db7698..e8115e4f5 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.html
@@ -32,7 +32,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
+                        <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
                             Test
                             <div id="spinner"></div>
                         </button>
@@ -43,7 +43,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                        <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
                     </div>
                 </div>
             </form>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.html
index 8ce9b401d..926b344e0 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.html
@@ -74,7 +74,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
+                        <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
                             Test
                             <div id="spinner"></div>
                         </button>
@@ -85,7 +85,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                        <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
                     </div>
                 </div>
             </form>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.html
index 15ef796fc..378e48060 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/slack.component.html
@@ -57,7 +57,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
+                        <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
                             Test
                             <div id="spinner"></div>
                         </button>
@@ -68,7 +68,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                        <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
                     </div>
                 </div>
             </form>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.html
index d89d14483..51e4c36d4 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.html
@@ -43,7 +43,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
+                        <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
                             Test
                             <div id="spinner"></div>
                         </button>
@@ -52,7 +52,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                        <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
                     </div>
                 </div>
             </form>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.html
index 8ab28cc3c..aab095953 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.html
@@ -31,7 +31,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
+                        <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
                             Test
                             <div id="spinner"></div>
                         </button>
@@ -40,7 +40,7 @@
 
                 <div class="form-group">
                     <div>
-                        <button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                        <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
                     </div>
                 </div>
             </form>
diff --git a/src/Ombi/ClientApp/src/styles/Styles.scss b/src/Ombi/ClientApp/src/styles/Styles.scss
index df9e6028d..55bc8657c 100644
--- a/src/Ombi/ClientApp/src/styles/Styles.scss
+++ b/src/Ombi/ClientApp/src/styles/Styles.scss
@@ -145,3 +145,15 @@
     hr{
         border-top: 1px solid $ombi-background-primary;
     }
+
+    .form-control{
+        background-color: $ombi-background-accent;
+        color:#FFF;
+        border: 1px solid $ombi-background-accent;
+    }
+
+    .form-control:focus{
+        background-color: $ombi-background-accent;
+        color:#FFF;
+        border: 1px solid $ombi-active;
+    }