diff --git a/pom.xml b/pom.xml
index df37c21..94e9244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4beta4</version>
+	<version>4.0.0</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/resources/public/index.html b/src/main/resources/public/index.html
index 0264c5a..153216f 100644
--- a/src/main/resources/public/index.html
+++ b/src/main/resources/public/index.html
@@ -44,6 +44,16 @@
 							<li><a href="http://www.bwssystems.com" target="_blank">Developed by BWS Systems</a></li>
 							<li><a href="http://www.amazon.com/echo" target="_blank">Amazon Echo</a></li>
 							<li><a href="">HA Bridge Version {{bridge.habridgeversion}}</a></li>
+							<li><center>
+								<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+								<input type="hidden" name="cmd" value="_s-xclick">
+								<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
+								">
+								<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+								<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
+								</form>
+								</center>
+							</li>
 						</ul>
 					</li>
 				</ul>
diff --git a/src/main/resources/public/views/configuration.html b/src/main/resources/public/views/configuration.html
index 94452d5..1036648 100644
--- a/src/main/resources/public/views/configuration.html
+++ b/src/main/resources/public/views/configuration.html
@@ -24,9 +24,9 @@
 
 <div class="panel panel-default">
 	<div class="panel-heading">
-		<h2 class="panel-title">Current devices
-			({{bridge.devices.length}})</h2>
+		<h1 class="panel-title">Current devices ({{bridge.devices.length}})</h1>
 	</div>
+	<div class="panel-body">
 
 		<p>
 			<button class="btn btn-primary" type="submit" ng-click="renumberDevices()">Renumber Devices</button>
@@ -67,6 +67,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -75,7 +76,7 @@
 				class={{imgBkUrl}} aria-hidden="true"></span></a>
 		</h1>
 	</div>
-	<div ng-if="visibleBk" class="animate-if" class="panel-body">
+	<div ng-if="visibleBk" class="panel-body">
 		<p>Control your backups from this area. Use the default name by hitting backup or specify your own.</p>
 		<form class="form-horizontal">
 			<div class="form-group">
diff --git a/src/main/resources/public/views/haldevice.html b/src/main/resources/public/views/haldevice.html
index 3b4efae..68b51c7 100644
--- a/src/main/resources/public/views/haldevice.html
+++ b/src/main/resources/public/views/haldevice.html
@@ -47,7 +47,6 @@
 			feature. Select your items and dim control type if wanted, then click
 			bulk add below. Your items will be added with on and off or dim and
 			off if selected with the name of the device from the HAL.</p>
-	</div>
 	<scrollable-table watch="bridge.haldevices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
@@ -121,6 +120,7 @@
 			ng-click="bulkAddDevices(device_dim_control)">Bulk Add
 			({{bulk.devices.length}})</button>
 	</div>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -129,7 +129,9 @@
 				class={{imgButtonsUrl}} aria-hidden="true"></span></a></a>
 		</h2>
 	</div>
-	<scrollable-table ng-if="buttonsVisible" watch="bridge.haldevices">
+	<div ng-if="buttonsVisible" class="panel-body">
+	
+	<scrollable-table watch="bridge.haldevices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
 			<tr>
@@ -159,6 +161,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <script type="text/ng-template" id="deleteMapandIdDialog">
 		<div class="ngdialog-message">
diff --git a/src/main/resources/public/views/harmonyactivity.html b/src/main/resources/public/views/harmonyactivity.html
index fb344ad..a4a43aa 100644
--- a/src/main/resources/public/views/harmonyactivity.html
+++ b/src/main/resources/public/views/harmonyactivity.html
@@ -33,7 +33,6 @@
 			 done in the edit tab, click the 'Add Bridge Device' to
 			finish that selection setup. The 'Already Configured Activities' list
 			below will show what is already setup for your Harmony Hubs.</p>
-	</div>
 
 	<scrollable-table watch="bridge.harmonyactivities">
 	<table class="table table-bordered table-striped table-hover">
@@ -59,6 +58,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -67,8 +67,8 @@
 				class={{imgButtonsUrl}} aria-hidden="true"></span></a>
 		</h2>
 	</div>
-	<scrollable-table ng-if="buttonsVisible"
-		watch="bridge.harmonyactivities">
+	<div ng-if="buttonsVisible" class="panel-body">
+	<scrollable-table watch="bridge.harmonyactivities">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
 			<tr>
@@ -96,6 +96,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <script type="text/ng-template" id="deleteMapandIdDialog">
 		<div class="ngdialog-message">
diff --git a/src/main/resources/public/views/harmonydevice.html b/src/main/resources/public/views/harmonydevice.html
index bddd96b..523e969 100644
--- a/src/main/resources/public/views/harmonydevice.html
+++ b/src/main/resources/public/views/harmonydevice.html
@@ -34,7 +34,6 @@
 			'Add Bridge Device' to finish that selection setup. The 'Already
 			Configured Harmony Buttons' list below will show what is already
 			setup for your Harmony Hubs.</p>
-	</div>
 
 	<scrollable-table watch="bridge.harmonydevices">
 	<table class="table table-bordered table-striped table-hover">
@@ -78,8 +77,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
-	</li>
-	</ul>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -88,7 +86,8 @@
 				class={{imgButtonsUrl}} aria-hidden="true"></span></a>
 		</h2>
 	</div>
-	<scrollable-table ng-if="buttonsVisible" watch="bridge.harmonydevices">
+	<div ng-if="buttonsVisible" class="panel-body">
+	<scrollable-table watch="bridge.harmonydevices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
 			<tr>
@@ -116,6 +115,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <script type="text/ng-template" id="deleteMapandIdDialog">
 		<div class="ngdialog-message">
diff --git a/src/main/resources/public/views/hassdevice.html b/src/main/resources/public/views/hassdevice.html
index 150aced..0a6270e 100644
--- a/src/main/resources/public/views/hassdevice.html
+++ b/src/main/resources/public/views/hassdevice.html
@@ -49,7 +49,6 @@
 			feature. Select your items and dim control type if wanted, then click
 			bulk add below. Your items will be added with on and off or dim and
 			off if selected with the name of the device from the HomeAssitant.</p>
-	</div>
 	<scrollable-table watch="bridge.hassdevices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
@@ -102,6 +101,7 @@
 			ng-click="bulkAddDevices(device_dim_control)">Bulk Add
 			({{bulk.devices.length}})</button>
 	</div>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -110,7 +110,8 @@
 				class={{imgButtonsUrl}} aria-hidden="true"></span></a>
 		</h2>
 	</div>
-	<scrollable-table ng-if="buttonsVisible" watch="bridge.hassdevices">
+	<div ng-if="buttonsVisible" class="panel-body">
+	<scrollable-table watch="bridge.hassdevices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
 			<tr>
@@ -138,6 +139,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <script type="text/ng-template" id="deleteMapandIdDialog">
 		<div class="ngdialog-message">
diff --git a/src/main/resources/public/views/huedevice.html b/src/main/resources/public/views/huedevice.html
index 4354fd5..ac5c31a 100644
--- a/src/main/resources/public/views/huedevice.html
+++ b/src/main/resources/public/views/huedevice.html
@@ -38,7 +38,6 @@
 			feature. Select your items, then click bulk add below. Your items
 			will be added with on and off or dim and off if selected with the
 			name of the device from the Hue.</p>
-	</div>
 	<scrollable-table watch="bridge.huedevices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
@@ -74,6 +73,7 @@
 			ng-click="bulkAddDevices()">Bulk Add
 			({{bulk.devices.length}})</button>
 	</div>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -82,7 +82,8 @@
 				class={{imgButtonsUrl}} aria-hidden="true"></span></a></a>
 		</h2>
 	</div>
-	<scrollable-table ng-if="buttonsVisible" watch="bridge.huedevices">
+	<div ng-if="buttonsVisible" class="panel-body">
+	<scrollable-table watch="bridge.huedevices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
 			<tr>
@@ -110,6 +111,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <script type="text/ng-template" id="deleteMapandIdDialog">
 		<div class="ngdialog-message">
diff --git a/src/main/resources/public/views/logs.html b/src/main/resources/public/views/logs.html
index cccc582..44fb156 100644
--- a/src/main/resources/public/views/logs.html
+++ b/src/main/resources/public/views/logs.html
@@ -29,7 +29,6 @@
 			<button class="btn btn-primary" type="submit" ng-click="updateLogs()">Update
 				Log</button>
 		</p>
-	</div>
 	<scrollable-table watch="bridge.logMsgs">
 	<table class="table table-striped table-bordered table-hover">
 		<thead>
@@ -48,6 +47,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -56,7 +56,7 @@
 				class={{imgUrl}} aria-hidden="true"></a>
 		</h1>
 	</div>
-	<div ng-if="visible" class="animate-if" class="panel-body">
+	<div ng-if="visible" class="panel-body">
 		<p>
 			<button class="btn btn-primary" type="submit"
 				ng-click="updateLoggers()">Update Log Levels</button>
diff --git a/src/main/resources/public/views/mqttpublish.html b/src/main/resources/public/views/mqttpublish.html
index 728632b..ed2604f 100644
--- a/src/main/resources/public/views/mqttpublish.html
+++ b/src/main/resources/public/views/mqttpublish.html
@@ -30,7 +30,6 @@
 			'Add Bridge Device' to finish that selection setup. The 'Already
 			Configured MQTT Publish messages' list below will show what is already
 			setup for your MQTT Brokers.</p>
-	</div>
 
 	<scrollable-table watch="bridge.mqttbrokers">
 	<table class="table table-bordered table-striped table-hover">
@@ -64,8 +63,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
-	</li>
-	</ul>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -74,7 +72,8 @@
 				class={{imgButtonsUrl}} aria-hidden="true"></span></a>
 		</h2>
 	</div>
-	<scrollable-table ng-if="buttonsVisible" watch="bridge.mqttbrokers">
+	<div ng-if="buttonsVisible" class="panel-body">
+	<scrollable-table watch="bridge.mqttbrokers">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
 			<tr>
@@ -102,6 +101,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <script type="text/ng-template" id="deleteMapandIdDialog">
 		<div class="ngdialog-message">
diff --git a/src/main/resources/public/views/nestactions.html b/src/main/resources/public/views/nestactions.html
index 185b95b..1b7a8ed 100644
--- a/src/main/resources/public/views/nestactions.html
+++ b/src/main/resources/public/views/nestactions.html
@@ -33,7 +33,6 @@
 			 done in the edit tab, click the 'Add Bridge Device' to finish that selection
 			setup. The 'Already Configured Nest Items' list below will show what
 			is already setup for your Nest.</p>
-	</div>
 
 	<scrollable-table watch="bridge.nestitems">
 	<table class="table table-bordered table-striped table-hover">
@@ -81,6 +80,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -89,7 +89,8 @@
 				class={{imgButtonsUrl}} aria-hidden="true"></span></a>
 		</h2>
 	</div>
-	<scrollable-table ng-if="buttonsVisible" watch="bridge.nestitems">
+	<div ng-if="buttonsVisible" class="panel-body">
+	<scrollable-table watch="bridge.nestitems">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
 			<tr>
@@ -116,6 +117,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <script type="text/ng-template" id="deleteMapandIdDialog">
 		<div class="ngdialog-message">
diff --git a/src/main/resources/public/views/system.html b/src/main/resources/public/views/system.html
index 9a138de..75cb114 100644
--- a/src/main/resources/public/views/system.html
+++ b/src/main/resources/public/views/system.html
@@ -372,7 +372,7 @@
 				class={{imgUrl}} aria-hidden="true"></a>
 		</h1>
 	</div>
-	<div ng-if="visible" class="animate-if" class="panel-body">
+	<div ng-if="visible" class="panel-body">
 		<p>Control your backups from this area. Use the default name by hitting backup or specify your own.</p>
 		<form class="form-horizontal">
 			<div class="form-group">
diff --git a/src/main/resources/public/views/veradevice.html b/src/main/resources/public/views/veradevice.html
index 5461f3c..69b7a39 100644
--- a/src/main/resources/public/views/veradevice.html
+++ b/src/main/resources/public/views/veradevice.html
@@ -48,7 +48,6 @@
 			feature. Select your items and dim control type if wanted, then click
 			bulk add below. Your items will be added with on and off or dim and
 			off if selected with the name of the device from the Vera.</p>
-	</div>
 	<scrollable-table watch="bridge.veradevices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
@@ -89,6 +88,7 @@
 			ng-click="bulkAddDevices(device_dim_control)">Bulk Add
 			({{bulk.devices.length}})</button>
 	</div>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -97,7 +97,8 @@
 				class={{imgButtonsUrl}} aria-hidden="true"></span></a></a>
 		</h2>
 	</div>
-	<scrollable-table ng-if="buttonsVisible" watch="bridge.devices">
+	<div ng-if="buttonsVisible" class="panel-body">
+	<scrollable-table watch="bridge.devices">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
 			<tr>
@@ -125,6 +126,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <script type="text/ng-template" id="deleteMapandIdDialog">
 		<div class="ngdialog-message">
diff --git a/src/main/resources/public/views/verascene.html b/src/main/resources/public/views/verascene.html
index 7973275..871be18 100644
--- a/src/main/resources/public/views/verascene.html
+++ b/src/main/resources/public/views/verascene.html
@@ -32,7 +32,6 @@
 			 done in the edit tab, click the 'Add Bridge Device' to finish that selection
 			setup. The 'Already Configured Vera Scenes' list below will show what
 			is already setup for your Vera.</p>
-	</div>
 
 	<scrollable-table watch="bridge.verascenes">
 	<table class="table table-bordered table-striped table-hover">
@@ -59,6 +58,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -67,7 +67,8 @@
 				class={{imgButtonsUrl}} aria-hidden="true"></span></a>
 		</h2>
 	</div>
-	<scrollable-table ng-if="buttonsVisible" watch="bridge.verascenes">
+	<div ng-if="buttonsVisible" class="panel-body">
+	<scrollable-table watch="bridge.verascenes">
 	<table class="table table-bordered table-striped table-hover">
 		<thead>
 			<tr>
@@ -95,6 +96,7 @@
 		</tr>
 	</table>
 	</scrollable-table>
+	</div>
 </div>
 <script type="text/ng-template" id="deleteMapandIdDialog">
 		<div class="ngdialog-message">