diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.html
index 13fc86050..e40815036 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.html
@@ -1,3 +1,3 @@
-<div *ngIf="movie && radarrEnabled">
+<div *ngIf="movie && radarrEnabled" class="text-center">
     <button mat-raised-button color="warn" class="text-center" (click)="openAdvancedOptions();">Advanced Options</button>
 </div>
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/twilio/twilio.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/twilio/twilio.component.html
index e28ec4115..9c9d0ea1e 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/twilio/twilio.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/twilio/twilio.component.html
@@ -3,6 +3,7 @@
 <div *ngIf="form" class="container">
     <fieldset>
         <legend>Twilio</legend>
+        <span>Below are the supported integrations with Twilio</span>
         <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
 
             <mat-tab-group>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/twilio/whatsapp.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/twilio/whatsapp.component.html
index 1b6b155b8..9ce863df7 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/twilio/whatsapp.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/twilio/whatsapp.component.html
@@ -1,35 +1,37 @@
-<div [formGroup]="form" class="col">
-    <div formGroupName="whatsAppSettings">
-        <div class="col">
-            <div>
-                <mat-slide-toggle formControlName="enabled">Enable</mat-slide-toggle>
+<div class="container" style="padding-top: 3%;">
+    <div [formGroup]="form" class="col">
+        <div formGroupName="whatsAppSettings" class="row">
+            <div class="col">
+                <div>
+                    <mat-slide-toggle formControlName="enabled">Enable</mat-slide-toggle>
+                </div>
+
+                <div class="md-form-field">
+                    <mat-form-field>
+                        <input matInput placeholder="From Number" formControlName="from" matTooltip="The mobile number that the WhatsApp message is from, with the international prefix">
+                    </mat-form-field>
+                </div>
+                <div class="md-form-field">
+                    <mat-form-field>
+                        <input matInput placeholder="Account SID" formControlName="accountSid" matTooltip="The Account SID that you can find from the Programmable SMS Dashboard">
+                    </mat-form-field>
+                </div>
+                <div class="md-form-field">
+                    <mat-form-field>
+                        <input matInput placeholder="Authentication Token" formControlName="authToken" matTooltip="The Auth Token that you can find from the Programmable SMS Dashboard">
+                    </mat-form-field>
+                </div>
+                <div class="md-form-field">
+                    <div>
+                        <button mat-raised-button type="button" color="accent" (click)="test(form)">Test</button>
+                    </div>
+                </div>
             </div>
 
-
-            <div class="md-form-field">
-                <mat-form-field>
-                    <input matInput placeholder="From Number" formControlName="from">
-                </mat-form-field>
-            </div>
-            <div class="md-form-field">
-                <mat-form-field>
-                    <input matInput placeholder="Account SID" formControlName="accountSid">
-                </mat-form-field>
-            </div>
-            <div class="md-form-field">
-                <mat-form-field>
-                    <input matInput placeholder="Authentication Token" formControlName="authToken">
-                </mat-form-field>
-            </div>
-        </div>
-
-        <div class="col">
-            <notification-templates [templates]="templates" [showSubject]="false"></notification-templates>
-        </div>
-        <div class="md-form-field">
-            <div>
-                <button mat-raised-button type="button" color="primary" (click)="test(form)">Test</button>
+            <div class="col">
+                <notification-templates [templates]="templates" [showSubject]="false"></notification-templates>
             </div>
+      
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/settings/wiki.component.html b/src/Ombi/ClientApp/src/app/settings/wiki.component.html
index 9f02b1354..c02b42d5b 100644
--- a/src/Ombi/ClientApp/src/app/settings/wiki.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/wiki.component.html
@@ -1,5 +1,5 @@
-<div class="col-md-12">
-    <div *ngIf="!text" class="col-md-1 offset-md-11">
+<div class="col">
+    <div *ngIf="!text" class="col-md-4 ml-auto ">
         <a href="{{url}}" target="_blank">
         <button mat-raised-button color="accent">
             <span>Wiki</span>
@@ -7,7 +7,7 @@
     </a>
     </div>
 
-    <div  *ngIf="text" class="col-md-1 offset-md-9">
+    <div *ngIf="text" class="col-md-4 ml-auto ">
             <a href="{{url}}" target="_blank">
             <button mat-raised-button color="accent">
                 <span>{{text}}</span>