diff --git a/app/azure/views/containerinstances/containerinstances.html b/app/azure/views/containerinstances/containerinstances.html
index d83583a5e..4b792955d 100644
--- a/app/azure/views/containerinstances/containerinstances.html
+++ b/app/azure/views/containerinstances/containerinstances.html
@@ -7,6 +7,7 @@
   <rd-header-content>Container instances</rd-header-content>
 </rd-header>
 
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <containergroups-datatable
@@ -17,3 +18,4 @@
     ></containergroups-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/azure/views/containerinstances/create/createcontainerinstance.html b/app/azure/views/containerinstances/create/createcontainerinstance.html
index 54346eef6..f35bc2414 100644
--- a/app/azure/views/containerinstances/create/createcontainerinstance.html
+++ b/app/azure/views/containerinstances/create/createcontainerinstance.html
@@ -4,7 +4,7 @@
     <a ui-sref="azure.containerinstances">Container instances</a> &gt; Add container
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -158,3 +158,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/azure/views/dashboard/dashboard.html b/app/azure/views/dashboard/dashboard.html
index eaa60a53e..c785badd2 100644
--- a/app/azure/views/dashboard/dashboard.html
+++ b/app/azure/views/dashboard/dashboard.html
@@ -3,6 +3,7 @@
   <rd-header-content>Dashboard</rd-header-content>
 </rd-header>
 
+<rd-body>
 <div class="row" ng-if="subscriptions">
   <div class="col-sm-12 col-md-6">
     <a ui-sref="azure.subscriptions">
@@ -31,3 +32,4 @@
     </a>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/components/host-overview/host-overview.html b/app/docker/components/host-overview/host-overview.html
index 968c09708..320c2afb3 100644
--- a/app/docker/components/host-overview/host-overview.html
+++ b/app/docker/components/host-overview/host-overview.html
@@ -7,7 +7,7 @@
   </rd-header-title>
   <rd-header-content>Docker</rd-header-content>
 </rd-header>
-
+<rd-body>
 <information-panel-offline ng-if="$ctrl.offlineMode"></information-panel-offline>
 
 <host-details-panel
@@ -32,3 +32,4 @@
 <disks-panel ng-if="$ctrl.isAgent && $ctrl.agentApiVersion > 1 && !$ctrl.offlineMode && $ctrl.hostFeaturesEnabled" disks="$ctrl.disks"></disks-panel>
 
 <ng-transclude></ng-transclude>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/configs/configs.html b/app/docker/views/configs/configs.html
index 445153dc0..d17a84a1f 100644
--- a/app/docker/views/configs/configs.html
+++ b/app/docker/views/configs/configs.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Configs</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <configs-datatable
@@ -18,3 +18,4 @@
     ></configs-datatable>
   </div>
 </div>
+</rd-body>
diff --git a/app/docker/views/configs/create/createconfig.html b/app/docker/views/configs/create/createconfig.html
index 158cc4c2f..4cc83a0ce 100644
--- a/app/docker/views/configs/create/createconfig.html
+++ b/app/docker/views/configs/create/createconfig.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.configs">Configs</a> &gt; Add config
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -77,3 +77,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/configs/edit/config.html b/app/docker/views/configs/edit/config.html
index 5fb4dda01..d4127da68 100644
--- a/app/docker/views/configs/edit/config.html
+++ b/app/docker/views/configs/edit/config.html
@@ -8,7 +8,7 @@
     <a ui-sref="docker.configs">Configs</a> &gt; <a ui-sref="docker.configs.config({id: config.Id})">{{ config.Name }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -84,3 +84,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/containers/console/containerconsole.html b/app/docker/views/containers/console/containerconsole.html
index e938c49c0..29322d9ef 100644
--- a/app/docker/views/containers/console/containerconsole.html
+++ b/app/docker/views/containers/console/containerconsole.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: container.Id})">{{ container.Name|trimcontainername }}</a> &gt; Console
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="state.loaded">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -73,3 +73,4 @@
     <div id="terminal-container" class="terminal-container"></div>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/containers/containers.html b/app/docker/views/containers/containers.html
index 88c6d0b6a..c4871f794 100644
--- a/app/docker/views/containers/containers.html
+++ b/app/docker/views/containers/containers.html
@@ -6,6 +6,7 @@
   </rd-header-title>
   <rd-header-content>Containers</rd-header-content>
 </rd-header>
+<rd-body>
 <information-panel-offline ng-if="offlineMode"></information-panel-offline>
 <div class="row">
   <div class="col-sm-12" ng-if="containers">
@@ -20,3 +21,4 @@
     ></containers-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index 3f61e44fb..9b8ccb43b 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.containers">Containers</a> &gt; Add container
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -661,3 +661,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/containers/edit/container.html b/app/docker/views/containers/edit/container.html
index a251ae2d2..873c3b80a 100644
--- a/app/docker/views/containers/edit/container.html
+++ b/app/docker/views/containers/edit/container.html
@@ -5,7 +5,7 @@
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: container.Id})">{{ container.Name|trimcontainername }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
   <div class="row">
     <div class="col-lg-12 col-md-12 col-xs-12">
       <rd-widget>
@@ -279,3 +279,4 @@
       ></container-networks-datatable>
     </div>
   </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/containers/inspect/containerinspect.html b/app/docker/views/containers/inspect/containerinspect.html
index b381ed2bb..11e794703 100644
--- a/app/docker/views/containers/inspect/containerinspect.html
+++ b/app/docker/views/containers/inspect/containerinspect.html
@@ -5,7 +5,7 @@
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: containerInfo.Id})">{{ containerInfo.Name|trimcontainername }}</a> &gt; Inspect
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -22,3 +22,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/containers/logs/containerlogs.html b/app/docker/views/containers/logs/containerlogs.html
index 133e354c2..68a8640ae 100644
--- a/app/docker/views/containers/logs/containerlogs.html
+++ b/app/docker/views/containers/logs/containerlogs.html
@@ -4,7 +4,8 @@
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: container.Id})">{{ container.Name|trimcontainername }}</a> &gt; Logs
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <log-viewer
   data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount" since-timestamp="state.sinceTimestamp"
 ></log-viewer>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/containers/stats/containerstats.html b/app/docker/views/containers/stats/containerstats.html
index 13fe72145..5f1233095 100644
--- a/app/docker/views/containers/stats/containerstats.html
+++ b/app/docker/views/containers/stats/containerstats.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: container.Id})">{{ container.Name|trimcontainername }}</a> &gt; Stats
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-md-12">
     <rd-widget>
@@ -91,3 +91,4 @@
     ></container-processes-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/dashboard/dashboard.html b/app/docker/views/dashboard/dashboard.html
index 89cee5867..cdcbe302c 100644
--- a/app/docker/views/dashboard/dashboard.html
+++ b/app/docker/views/dashboard/dashboard.html
@@ -3,6 +3,7 @@
   <rd-header-content>Endpoint summary</rd-header-content>
 </rd-header>
 
+<rd-body>
 <div class="row" ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
   <div class="col-sm-12">
     <dashboard-cluster-agent-info></dashboard-cluster-agent-info>
@@ -162,3 +163,4 @@
     </a>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/events/events.html b/app/docker/views/events/events.html
index d67e3fc44..4216a641a 100644
--- a/app/docker/views/events/events.html
+++ b/app/docker/views/events/events.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Events</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <events-datatable
@@ -17,3 +17,4 @@
     ></events-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/host/host-browser-view/host-browser-view.html b/app/docker/views/host/host-browser-view/host-browser-view.html
index 2d87e4b2e..daca48852 100644
--- a/app/docker/views/host/host-browser-view/host-browser-view.html
+++ b/app/docker/views/host/host-browser-view/host-browser-view.html
@@ -4,7 +4,7 @@
       Host &gt; <a ui-sref="docker.host">{{ $ctrl.host.Name }}</a> &gt; browse
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <host-browser
@@ -12,3 +12,4 @@
     ></host-browser>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/host/host-job/host-job.html b/app/docker/views/host/host-job/host-job.html
index adfbd970b..42371e765 100644
--- a/app/docker/views/host/host-job/host-job.html
+++ b/app/docker/views/host/host-job/host-job.html
@@ -4,7 +4,7 @@
     Host &gt; <a ui-sref="docker.host">{{ $ctrl.host.Name }}</a> &gt; execute job
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -14,3 +14,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/images/build/buildimage.html b/app/docker/views/images/build/buildimage.html
index 7820c4b9b..fdede1ccd 100644
--- a/app/docker/views/images/build/buildimage.html
+++ b/app/docker/views/images/build/buildimage.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.images">Images</a> &gt; Build image
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -239,3 +239,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html
index ac0a13239..f59d083d5 100644
--- a/app/docker/views/images/edit/image.html
+++ b/app/docker/views/images/edit/image.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.images">Images</a> &gt; <a ui-sref="docker.images.image({id: image.Id})">{{ image.Id }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="image.RepoTags.length > 0">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -246,3 +246,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/images/images.html b/app/docker/views/images/images.html
index 8637e4e25..557c865b9 100644
--- a/app/docker/views/images/images.html
+++ b/app/docker/views/images/images.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Images</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="!offlineMode">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -67,3 +67,4 @@
     ></images-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/images/import/importimage.html b/app/docker/views/images/import/importimage.html
index 6a6b20f31..dd8a47741 100644
--- a/app/docker/views/images/import/importimage.html
+++ b/app/docker/views/images/import/importimage.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.images">Images</a> &gt; Import image
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -57,4 +57,5 @@
       </rd-widget-body>
     </rd-widget>
   </div>
-</div>
\ No newline at end of file
+</div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/networks/create/createnetwork.html b/app/docker/views/networks/create/createnetwork.html
index 03711c36c..9c34e1972 100644
--- a/app/docker/views/networks/create/createnetwork.html
+++ b/app/docker/views/networks/create/createnetwork.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.networks">Networks</a> &gt; Add network
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -182,4 +182,5 @@
       </rd-widget-body>
     </rd-widget>
   </div>
-</div>
\ No newline at end of file
+</div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/networks/edit/network.html b/app/docker/views/networks/edit/network.html
index f22562163..3a9fc506e 100644
--- a/app/docker/views/networks/edit/network.html
+++ b/app/docker/views/networks/edit/network.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.networks">Networks</a> &gt; <a ui-sref="docker.networks.network({id: network.Id})">{{ network.Name }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -111,3 +111,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/networks/networks.html b/app/docker/views/networks/networks.html
index c547d54ba..b3b96f1aa 100644
--- a/app/docker/views/networks/networks.html
+++ b/app/docker/views/networks/networks.html
@@ -6,6 +6,7 @@
   </rd-header-title>
   <rd-header-content>Networks</rd-header-content>
 </rd-header>
+<rd-body>
 <information-panel-offline ng-if="offlineMode"></information-panel-offline>
 <div class="row">
   <div class="col-sm-12">
@@ -20,3 +21,4 @@
     ></networks-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/nodes/node-browser/node-browser.html b/app/docker/views/nodes/node-browser/node-browser.html
index 2edeae199..8a783b662 100644
--- a/app/docker/views/nodes/node-browser/node-browser.html
+++ b/app/docker/views/nodes/node-browser/node-browser.html
@@ -4,7 +4,7 @@
       <a ui-sref="docker.swarm">Swarm</a> &gt; <a ui-sref="docker.nodes.node({ id: $ctrl.nodeId })">{{ $ctrl.node.Hostname }}</a> &gt; browse
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <host-browser
@@ -12,3 +12,4 @@
     ></host-browser>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/nodes/node-job/node-job.html b/app/docker/views/nodes/node-job/node-job.html
index 90ae92d14..9cd7c1eac 100644
--- a/app/docker/views/nodes/node-job/node-job.html
+++ b/app/docker/views/nodes/node-job/node-job.html
@@ -4,7 +4,7 @@
       <a ui-sref="docker.swarm">Swarm</a> &gt; <a ui-sref="docker.nodes.node({ id: $ctrl.nodeId })">{{ $ctrl.node.Hostname }}</a> &gt; execute job
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -16,3 +16,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/secrets/create/createsecret.html b/app/docker/views/secrets/create/createsecret.html
index 167e373f7..6112a9046 100644
--- a/app/docker/views/secrets/create/createsecret.html
+++ b/app/docker/views/secrets/create/createsecret.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.secrets">Secrets</a> &gt; Add secret
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -88,3 +88,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/secrets/edit/secret.html b/app/docker/views/secrets/edit/secret.html
index c8c5fa3de..4c445cbb8 100644
--- a/app/docker/views/secrets/edit/secret.html
+++ b/app/docker/views/secrets/edit/secret.html
@@ -8,7 +8,7 @@
     <a ui-sref="docker.secrets">Secrets</a> &gt; <a ui-sref="docker.secrets.secret({id: secret.Id})">{{ secret.Name }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -61,3 +61,4 @@
   resource-type="'secret'">
 </por-access-control-panel>
 <!-- !access-control-panel -->
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/secrets/secrets.html b/app/docker/views/secrets/secrets.html
index 850e44fd1..d1a8212ee 100644
--- a/app/docker/views/secrets/secrets.html
+++ b/app/docker/views/secrets/secrets.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Secrets</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <secrets-datatable
@@ -18,3 +18,4 @@
     ></secrets-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html
index 2003ff97f..a8431b7de 100644
--- a/app/docker/views/services/create/createservice.html
+++ b/app/docker/views/services/create/createservice.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.services">Services</a> &gt; Add service
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -486,3 +486,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/services/edit/service.html b/app/docker/views/services/edit/service.html
index 0b3e2e854..621aa48c8 100644
--- a/app/docker/views/services/edit/service.html
+++ b/app/docker/views/services/edit/service.html
@@ -8,7 +8,7 @@
     <a ui-sref="docker.services">Services</a> &gt; <a ui-sref="docker.services.service({id: service.Id})">{{ service.Name }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div ng-if="isUpdating" class="col-lg-12 col-md-12 col-xs-12">
     <div class="alert alert-info" role="alert" id="service-update-alert">
@@ -196,3 +196,4 @@
     <div id="service-tasks" class="padding-top" ng-include="'app/docker/views/services/edit/includes/tasks.html'"></div>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/services/logs/servicelogs.html b/app/docker/views/services/logs/servicelogs.html
index 2544d2d94..9f3e25ba1 100644
--- a/app/docker/views/services/logs/servicelogs.html
+++ b/app/docker/views/services/logs/servicelogs.html
@@ -4,7 +4,8 @@
     <a ui-sref="docker.services">Services</a> > <a ui-sref="docker.services.service({id: service.Id})">{{ service.Name }}</a> &gt; Logs
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <log-viewer
   data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount" since-timestamp="state.sinceTimestamp"
 ></log-viewer>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/services/services.html b/app/docker/views/services/services.html
index 4e666ae73..6e180429f 100644
--- a/app/docker/views/services/services.html
+++ b/app/docker/views/services/services.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Services</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="services">
   <div class="col-sm-12">
     <services-datatable
@@ -23,3 +23,4 @@
     ></services-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/swarm/swarm.html b/app/docker/views/swarm/swarm.html
index aa2f9db20..079d9c3ab 100644
--- a/app/docker/views/swarm/swarm.html
+++ b/app/docker/views/swarm/swarm.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Swarm</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -55,3 +55,4 @@
     ></nodes-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/swarm/visualizer/swarmvisualizer.html b/app/docker/views/swarm/visualizer/swarmvisualizer.html
index 612354e25..92677692d 100644
--- a/app/docker/views/swarm/visualizer/swarmvisualizer.html
+++ b/app/docker/views/swarm/visualizer/swarmvisualizer.html
@@ -8,7 +8,7 @@
     <a ui-sref="docker.swarm">Swarm</a> &gt; <a ui-sref="docker.swarm.visualizer">Cluster visualizer</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -112,3 +112,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/tasks/edit/task.html b/app/docker/views/tasks/edit/task.html
index b7d5f8cda..6decc408c 100644
--- a/app/docker/views/tasks/edit/task.html
+++ b/app/docker/views/tasks/edit/task.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.services">Services</a> &gt; <a ui-sref="docker.services.service({id: service.Id })">{{ service.Name }}</a> &gt; {{ task.Id }}
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="task && service">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -53,3 +53,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/tasks/logs/tasklogs.html b/app/docker/views/tasks/logs/tasklogs.html
index 79c8f3028..5ad5a69ff 100644
--- a/app/docker/views/tasks/logs/tasklogs.html
+++ b/app/docker/views/tasks/logs/tasklogs.html
@@ -4,7 +4,8 @@
     <a ui-sref="docker.services">Services</a> &gt; <a ui-sref="docker.services.service({id: service.Id })">{{ service.Name }}</a> &gt; <a ui-sref="docker.tasks.task({id: task.Id })">{{ task.Id }}</a> &gt; Logs
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <log-viewer
   data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount" since-timestamp="state.sinceTimestamp"
 ></log-viewer>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/volumes/browse/browsevolume.html b/app/docker/views/volumes/browse/browsevolume.html
index e420b16e1..a5be87bb5 100644
--- a/app/docker/views/volumes/browse/browsevolume.html
+++ b/app/docker/views/volumes/browse/browsevolume.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.volumes">Volumes</a> &gt; <a ui-sref="docker.volumes.volume({ id: volumeId })">{{ volumeId }}</a> &gt; browse
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <volume-browser
@@ -15,3 +15,4 @@
     ></volume-browser>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/volumes/create/createvolume.html b/app/docker/views/volumes/create/createvolume.html
index a591661d8..8e455cfac 100644
--- a/app/docker/views/volumes/create/createvolume.html
+++ b/app/docker/views/volumes/create/createvolume.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.volumes">Volumes</a> &gt; Add volume
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -105,3 +105,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/volumes/edit/volume.html b/app/docker/views/volumes/edit/volume.html
index 9d191de5b..98e27ac46 100644
--- a/app/docker/views/volumes/edit/volume.html
+++ b/app/docker/views/volumes/edit/volume.html
@@ -4,7 +4,7 @@
     <a ui-sref="docker.volumes">Volumes</a> &gt; <a ui-sref="docker.volumes.volume({id: volume.Id})">{{ volume.Id }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="volume">
   <div class="col-sm-12">
     <rd-widget>
@@ -94,3 +94,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/docker/views/volumes/volumes.html b/app/docker/views/volumes/volumes.html
index 958246e49..2cc17045b 100644
--- a/app/docker/views/volumes/volumes.html
+++ b/app/docker/views/volumes/volumes.html
@@ -6,6 +6,7 @@
   </rd-header-title>
   <rd-header-content>Volumes</rd-header-content>
 </rd-header>
+<rd-body>
 <information-panel-offline ng-if="offlineMode"></information-panel-offline>
 <div class="row">
   <div class="col-sm-12">
@@ -21,3 +22,4 @@
     ></volumes-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/extensions/registry-management/views/configure/configureregistry.html b/app/extensions/registry-management/views/configure/configureregistry.html
index 3325230b3..019bcc4c5 100644
--- a/app/extensions/registry-management/views/configure/configureregistry.html
+++ b/app/extensions/registry-management/views/configure/configureregistry.html
@@ -5,6 +5,7 @@
   </rd-header-content>
 </rd-header>
 
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -159,3 +160,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/extensions/registry-management/views/repositories/edit/registryRepository.html b/app/extensions/registry-management/views/repositories/edit/registryRepository.html
index bb94f3247..56592ed07 100644
--- a/app/extensions/registry-management/views/repositories/edit/registryRepository.html
+++ b/app/extensions/registry-management/views/repositories/edit/registryRepository.html
@@ -10,7 +10,7 @@
     <a ui-sref="portainer.registries.registry.repository()">{{ repository.Name }} </a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-8">
     <rd-widget>
@@ -85,4 +85,5 @@
     <registries-repository-tags-datatable title-text="Tags" title-icon="fa-tags" dataset="tags" table-key="registryRepositoryTags"
       order-by="Name" remove-action="removeTags" retag-action="retagAction"></registries-repository-tags-datatable>
   </div>
-</div>
\ No newline at end of file
+</div>
+</rd-body>
\ No newline at end of file
diff --git a/app/extensions/registry-management/views/repositories/registryRepositories.html b/app/extensions/registry-management/views/repositories/registryRepositories.html
index 6ca3664c7..644a9a94d 100644
--- a/app/extensions/registry-management/views/repositories/registryRepositories.html
+++ b/app/extensions/registry-management/views/repositories/registryRepositories.html
@@ -8,7 +8,7 @@
     <a ui-sref="portainer.registries">Registries</a> &gt; <a ui-sref="portainer.registries.registry({id: registry.Id})">{{ registry.Name }}</a> &gt; Repositories
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <information-panel ng-if="state.displayInvalidConfigurationMessage" title-text="Registry management configuration required">
     <span class="small text-muted">
@@ -35,3 +35,4 @@
     </registry-repositories-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/extensions/storidge/views/cluster/cluster.html b/app/extensions/storidge/views/cluster/cluster.html
index 0adb52fa4..548dafe34 100644
--- a/app/extensions/storidge/views/cluster/cluster.html
+++ b/app/extensions/storidge/views/cluster/cluster.html
@@ -8,7 +8,7 @@
     <a ui-sref="storidge.cluster">Storidge</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -143,3 +143,4 @@
     </rd-widget>
   </div>
 </div> -->
+</rd-body>
\ No newline at end of file
diff --git a/app/extensions/storidge/views/monitor/monitor.html b/app/extensions/storidge/views/monitor/monitor.html
index 6521ced89..c80313504 100644
--- a/app/extensions/storidge/views/monitor/monitor.html
+++ b/app/extensions/storidge/views/monitor/monitor.html
@@ -8,7 +8,7 @@
     <a ui-sref="storidge.cluster">Storidge</a> &gt; <a ui-sref="storidge.monitor">Cluster monitoring</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-md-4 col-sm-12">
     <rd-widget>
@@ -199,3 +199,4 @@
     </rd-widget>
   </div>
 </div> -->
+</rd-body>
\ No newline at end of file
diff --git a/app/extensions/storidge/views/profiles/create/createprofile.html b/app/extensions/storidge/views/profiles/create/createprofile.html
index 7680d515e..6513bb83c 100644
--- a/app/extensions/storidge/views/profiles/create/createprofile.html
+++ b/app/extensions/storidge/views/profiles/create/createprofile.html
@@ -4,7 +4,7 @@
     <a ui-sref="storidge.cluster">Storidge</a> &gt; <a ui-sref="storidge.profiles">Profiles</a> &gt; Add profile
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-md-12">
     <rd-widget>
@@ -198,3 +198,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/extensions/storidge/views/profiles/edit/profile.html b/app/extensions/storidge/views/profiles/edit/profile.html
index 12994ad5f..a04f9932c 100644
--- a/app/extensions/storidge/views/profiles/edit/profile.html
+++ b/app/extensions/storidge/views/profiles/edit/profile.html
@@ -4,7 +4,7 @@
     <a ui-sref="storidge.cluster">Storidge</a> &gt; <a ui-sref="storidge.profiles">Profiles</a> &gt; {{ profile.Name }}
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="profile">
   <div class="col-md-12">
     <rd-widget>
@@ -196,3 +196,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/extensions/storidge/views/profiles/profiles.html b/app/extensions/storidge/views/profiles/profiles.html
index 092ce37ba..b6b53703b 100644
--- a/app/extensions/storidge/views/profiles/profiles.html
+++ b/app/extensions/storidge/views/profiles/profiles.html
@@ -8,7 +8,7 @@
     <a ui-sref="storidge.cluster">Storidge</a> &gt; <a ui-sref="storidge.profiles">Profiles</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-md-12">
     <rd-widget>
@@ -121,3 +121,4 @@
     </rd-widget>
   </div>
 </div> -->
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/components/rd-body/body.js b/app/portainer/components/rd-body/body.js
new file mode 100644
index 000000000..a3c32b21b
--- /dev/null
+++ b/app/portainer/components/rd-body/body.js
@@ -0,0 +1,32 @@
+angular.module('portainer.app')
+.directive('rdBody', ['$rootScope', '$timeout', function rdBody($rootScope, $timeout) {
+  var directive = {
+    scope: {
+      'ngModel': '='
+    },
+    transclude: true,
+    templateUrl: 'app/portainer/components/rd-body/body.template.html',
+    restrict: 'EA',
+    link: function(scope) {
+      var removeLoadingScreen = function() {
+        scope.viewLoading = false;
+        scope.viewLoadingTimeoutPromise = null;
+      };
+
+      scope.viewLoading = true;
+      scope.viewLoadingTimeoutPromise = $timeout(removeLoadingScreen, 1000);
+      $rootScope.$on('cfpLoadingBar:started', function() {
+        if (scope.viewLoadingTimeoutPromise) {
+          $timeout.cancel(scope.viewLoadingTimeoutPromise);
+          scope.viewLoadingTimeoutPromise = null;
+        }
+        scope.viewLoading = true;
+      });
+
+      $rootScope.$on('cfpLoadingBar:completed', function() {
+        scope.viewLoadingTimeoutPromise = $timeout(removeLoadingScreen, 1000);
+      });
+    }
+  };
+  return directive;
+}]);
\ No newline at end of file
diff --git a/app/portainer/components/rd-body/body.template.html b/app/portainer/components/rd-body/body.template.html
new file mode 100644
index 000000000..a5afe6f03
--- /dev/null
+++ b/app/portainer/components/rd-body/body.template.html
@@ -0,0 +1,22 @@
+<div class="page-wrapper" ng-show="viewLoading">
+    <!-- loading box -->
+    <div class="container simple-box">
+        <div class="col-md-6 col-md-offset-3 col-sm-6 col-sm-offset-3">
+            <!-- loading box logo -->
+            <div class="row">
+                <img ng-if="logo" ng-src="{{ logo }}" class="simple-box-logo">
+                <img ng-if="!logo" src="images/logo_alt.png" class="simple-box-logo" alt="Portainer">
+            </div>
+            <!-- !loading box logo -->
+            <!-- panel -->
+            <div class="row" style="text-align: center">
+                Loading data...
+                <i class="fa fa-spinner fa-spin" style="margin-left: 5px"></i>
+            </div>
+            <!-- !panel -->
+        </div>
+    </div>
+    <!-- !loading box -->
+</div>
+
+<div ng-transclude ng-show="!viewLoading"></div>
\ No newline at end of file
diff --git a/app/portainer/views/about/about.html b/app/portainer/views/about/about.html
index e95dc837f..164523112 100644
--- a/app/portainer/views/about/about.html
+++ b/app/portainer/views/about/about.html
@@ -5,7 +5,6 @@
     About Portainer
   </rd-header-content>
 </rd-header>
-
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -89,4 +88,4 @@
       </rd-widget-body>
     </rd-widget>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/portainer/views/account/account.html b/app/portainer/views/account/account.html
index d8c6fe955..a9f32eb33 100644
--- a/app/portainer/views/account/account.html
+++ b/app/portainer/views/account/account.html
@@ -2,7 +2,7 @@
   <rd-header-title title-text="User settings"></rd-header-title>
   <rd-header-content>User settings</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -63,3 +63,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/endpoints/access/endpointAccess.html b/app/portainer/views/endpoints/access/endpointAccess.html
index ed60af804..4808f68ec 100644
--- a/app/portainer/views/endpoints/access/endpointAccess.html
+++ b/app/portainer/views/endpoints/access/endpointAccess.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.endpoints">Endpoints</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a> &gt; Access management
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="endpoint">
   <div class="col-sm-12">
     <rd-widget>
@@ -44,3 +44,4 @@
     ></por-access-management>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html
index 4b7a762bd..d4c0e7a5d 100644
--- a/app/portainer/views/endpoints/create/createendpoint.html
+++ b/app/portainer/views/endpoints/create/createendpoint.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.endpoints">Endpoints</a> &gt; Add endpoint
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -250,3 +250,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/endpoints/edit/endpoint.html b/app/portainer/views/endpoints/edit/endpoint.html
index 6a1349d35..06f2249bc 100644
--- a/app/portainer/views/endpoints/edit/endpoint.html
+++ b/app/portainer/views/endpoints/edit/endpoint.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.endpoints">Endpoints</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -91,3 +91,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/endpoints/endpoints.html b/app/portainer/views/endpoints/endpoints.html
index 31591fcdc..7cac94e6f 100644
--- a/app/portainer/views/endpoints/endpoints.html
+++ b/app/portainer/views/endpoints/endpoints.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Endpoint management</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="!applicationState.application.endpointManagement">
   <div class="col-sm-12">
     <rd-widget>
@@ -34,3 +34,4 @@
     ></endpoints-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/extensions/extensions.html b/app/portainer/views/extensions/extensions.html
index f2ff0377e..fd3d4aa02 100644
--- a/app/portainer/views/extensions/extensions.html
+++ b/app/portainer/views/extensions/extensions.html
@@ -2,7 +2,7 @@
   <rd-header-title title-text="Extensions"></rd-header-title>
   <rd-header-content>Portainer extensions</rd-header-content>
 </rd-header>
-
+<rd-body>
 <information-panel title-text="Information">
   <span class="text-muted" style="font-size: 90%;">
     <p>
@@ -123,3 +123,4 @@
     </p>
   </span>
 </information-panel>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/extensions/inspect/extension.html b/app/portainer/views/extensions/inspect/extension.html
index 0a83740d9..278eb5f05 100644
--- a/app/portainer/views/extensions/inspect/extension.html
+++ b/app/portainer/views/extensions/inspect/extension.html
@@ -5,6 +5,7 @@
   </rd-header-content>
 </rd-header>
 
+<rd-body>
 <div class="row" ng-if="extension">
   <div class="col-sm-12">
     <rd-widget>
@@ -132,3 +133,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/groups/access/groupAccess.html b/app/portainer/views/groups/access/groupAccess.html
index 092f647c4..25e756d01 100644
--- a/app/portainer/views/groups/access/groupAccess.html
+++ b/app/portainer/views/groups/access/groupAccess.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.groups">Groups</a> &gt; <a ui-sref="portainer.groups.group({id: group.Id})">{{ group.Name }}</a> &gt; Access management
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="group">
   <div class="col-sm-12">
     <rd-widget>
@@ -32,3 +32,4 @@
     ></por-access-management>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/groups/create/creategroup.html b/app/portainer/views/groups/create/creategroup.html
index 36334979c..370db9ef7 100644
--- a/app/portainer/views/groups/create/creategroup.html
+++ b/app/portainer/views/groups/create/creategroup.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.groups">Endpoint groups</a> &gt; Add group
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -24,3 +24,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/groups/edit/group.html b/app/portainer/views/groups/edit/group.html
index 31e2f68bf..a8b38271c 100644
--- a/app/portainer/views/groups/edit/group.html
+++ b/app/portainer/views/groups/edit/group.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.groups">Groups</a> &gt; {{ ::group.Name }}
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -24,3 +24,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/groups/groups.html b/app/portainer/views/groups/groups.html
index 5b95d84b5..69730132f 100644
--- a/app/portainer/views/groups/groups.html
+++ b/app/portainer/views/groups/groups.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Endpoint group management</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <groups-datatable
@@ -18,3 +18,4 @@
     ></groups-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html
index b12d8e749..940ca5b67 100644
--- a/app/portainer/views/home/home.html
+++ b/app/portainer/views/home/home.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Endpoints</rd-header-content>
 </rd-header>
-
+<rd-body>
 <information-panel
   ng-if="motd && motd.Message !== '' && applicationState.UI.dismissedInfoHash !== motd.Hash"
   title-text="Important message"
@@ -40,3 +40,4 @@
     ></endpoint-list>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/registries/access/registryAccess.html b/app/portainer/views/registries/access/registryAccess.html
index b5485f4cb..32c5fd56f 100644
--- a/app/portainer/views/registries/access/registryAccess.html
+++ b/app/portainer/views/registries/access/registryAccess.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.registries">Registries</a> &gt; <a ui-sref="portainer.registries.registry({id: registry.Id})">{{ registry.Name }}</a> &gt; Access management
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="registry">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -41,3 +41,4 @@
 
 <por-access-management ng-if="registry" access-controlled-entity="registry" update-access="updateAccess(userAccesses, teamAccesses)">
 </por-access-management>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/registries/create/createregistry.html b/app/portainer/views/registries/create/createregistry.html
index fd6f33e43..e29819e8d 100644
--- a/app/portainer/views/registries/create/createregistry.html
+++ b/app/portainer/views/registries/create/createregistry.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.registries">Registries</a> &gt; Add registry
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -77,3 +77,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/registries/edit/registry.html b/app/portainer/views/registries/edit/registry.html
index c4d8ba9df..137004abc 100644
--- a/app/portainer/views/registries/edit/registry.html
+++ b/app/portainer/views/registries/edit/registry.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.registries">Registries</a> &gt; <a ui-sref="portainer.registries.registry({id: registry.Id})">{{ registry.Name }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -76,3 +76,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/registries/registries.html b/app/portainer/views/registries/registries.html
index 77ef9b773..6c0e24313 100644
--- a/app/portainer/views/registries/registries.html
+++ b/app/portainer/views/registries/registries.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Registry management</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="dockerhub">
   <div class="col-sm-12">
     <rd-widget>
@@ -80,3 +80,4 @@
     ></registries-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/schedules/create/createschedule.html b/app/portainer/views/schedules/create/createschedule.html
index 801cc41ca..2b2177a4d 100644
--- a/app/portainer/views/schedules/create/createschedule.html
+++ b/app/portainer/views/schedules/create/createschedule.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.schedules">Schedules</a> &gt; Add schedule
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -21,3 +21,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/schedules/edit/schedule.html b/app/portainer/views/schedules/edit/schedule.html
index fb7aa5625..ca13fe7f3 100644
--- a/app/portainer/views/schedules/edit/schedule.html
+++ b/app/portainer/views/schedules/edit/schedule.html
@@ -8,7 +8,7 @@
     <a ui-sref="portainer.schedules">Schedules</a> &gt; {{ ::schedule.Name }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -64,3 +64,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/schedules/schedules.html b/app/portainer/views/schedules/schedules.html
index 507640db8..296c1a5c3 100644
--- a/app/portainer/views/schedules/schedules.html
+++ b/app/portainer/views/schedules/schedules.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Schedules</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <schedules-datatable
@@ -17,3 +17,4 @@
     ></schedules-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/settings/authentication/settingsAuthentication.html b/app/portainer/views/settings/authentication/settingsAuthentication.html
index 72db0edef..5e4dd9ef0 100644
--- a/app/portainer/views/settings/authentication/settingsAuthentication.html
+++ b/app/portainer/views/settings/authentication/settingsAuthentication.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.settings">Settings</a> &gt; Authentication
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -322,3 +322,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html
index 1df7d0e7d..d13d6c7de 100644
--- a/app/portainer/views/settings/settings.html
+++ b/app/portainer/views/settings/settings.html
@@ -2,7 +2,7 @@
   <rd-header-title title-text="Settings"></rd-header-title>
   <rd-header-content>Settings</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -185,3 +185,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/stacks/create/createstack.html b/app/portainer/views/stacks/create/createstack.html
index c5c98b28c..f642fe409 100644
--- a/app/portainer/views/stacks/create/createstack.html
+++ b/app/portainer/views/stacks/create/createstack.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.stacks">Stacks</a> &gt; Add stack
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -226,3 +226,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html
index 7a0c1427e..2375702e3 100644
--- a/app/portainer/views/stacks/edit/stack.html
+++ b/app/portainer/views/stacks/edit/stack.html
@@ -8,7 +8,7 @@
     <a ui-sref="portainer.stacks">Stacks</a> &gt; {{ stackName }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -188,3 +188,4 @@
   resource-type="'stack'">
 </por-access-control-panel>
 <!-- !access-control-panel -->
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/stacks/stacks.html b/app/portainer/views/stacks/stacks.html
index e6ac1824b..0611fa72c 100644
--- a/app/portainer/views/stacks/stacks.html
+++ b/app/portainer/views/stacks/stacks.html
@@ -6,6 +6,7 @@
   </rd-header-title>
   <rd-header-content>Stacks</rd-header-content>
 </rd-header>
+<rd-body>
 <information-panel-offline ng-if="offlineMode"></information-panel-offline>
 <div class="row">
   <div class="col-sm-12">
@@ -19,3 +20,4 @@
     ></stacks-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/support/product/product.html b/app/portainer/views/support/product/product.html
index 554fd3fb7..eaa9f176a 100644
--- a/app/portainer/views/support/product/product.html
+++ b/app/portainer/views/support/product/product.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.support">Portainer support</a> &gt; {{ product.Name }}
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -82,3 +82,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/support/support.html b/app/portainer/views/support/support.html
index 97e0e3a7e..b9ce8b116 100644
--- a/app/portainer/views/support/support.html
+++ b/app/portainer/views/support/support.html
@@ -5,7 +5,7 @@
     Commercial support options
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <information-panel title-text="Information">
   <span class="small text-muted">
     <p>
@@ -32,3 +32,4 @@
     ></product-list>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/tags/tags.html b/app/portainer/views/tags/tags.html
index e0fa96e2f..1c5a2f674 100644
--- a/app/portainer/views/tags/tags.html
+++ b/app/portainer/views/tags/tags.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Tag management</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -57,3 +57,4 @@
     ></tags-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/teams/edit/team.html b/app/portainer/views/teams/edit/team.html
index dcd1eb1f8..3ba28f5f4 100644
--- a/app/portainer/views/teams/edit/team.html
+++ b/app/portainer/views/teams/edit/team.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.teams">Teams</a> &gt; <a ui-sref="portainer.teams.team({id: team.Id})">{{ team.Name }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -172,3 +172,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/teams/teams.html b/app/portainer/views/teams/teams.html
index 58733a269..0120af958 100644
--- a/app/portainer/views/teams/teams.html
+++ b/app/portainer/views/teams/teams.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Teams management</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row" ng-if="isAdmin">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -76,3 +76,4 @@
     ></teams-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/templates/create/createtemplate.html b/app/portainer/views/templates/create/createtemplate.html
index 49dbe20df..22089bd0b 100644
--- a/app/portainer/views/templates/create/createtemplate.html
+++ b/app/portainer/views/templates/create/createtemplate.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.templates">Templates</a> &gt; Add template
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -22,3 +22,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/templates/edit/template.html b/app/portainer/views/templates/edit/template.html
index 332354176..fc7d17463 100644
--- a/app/portainer/views/templates/edit/template.html
+++ b/app/portainer/views/templates/edit/template.html
@@ -8,7 +8,7 @@
     <a ui-sref="portainer.templates">Templates</a> &gt; {{ ::template.Title }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
@@ -26,3 +26,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/templates/templates.html b/app/portainer/views/templates/templates.html
index 3c31d116e..d404c7e26 100644
--- a/app/portainer/views/templates/templates.html
+++ b/app/portainer/views/templates/templates.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>Templates</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <!-- stack-form -->
   <div class="col-sm-12" ng-if="state.selectedTemplate && (state.selectedTemplate.Type === 2 || state.selectedTemplate.Type === 3)">
@@ -360,3 +360,4 @@
     ></template-list>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/users/edit/user.html b/app/portainer/views/users/edit/user.html
index 4c82b4b83..c460d5361 100644
--- a/app/portainer/views/users/edit/user.html
+++ b/app/portainer/views/users/edit/user.html
@@ -4,7 +4,7 @@
     <a ui-sref="portainer.users">Users</a> &gt; <a ui-sref="portainer.users.user({id: user.Id})">{{ user.Username }}</a>
   </rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -76,3 +76,4 @@
     </rd-widget>
   </div>
 </div>
+</rd-body>
\ No newline at end of file
diff --git a/app/portainer/views/users/users.html b/app/portainer/views/users/users.html
index 145dab962..617fa01bf 100644
--- a/app/portainer/views/users/users.html
+++ b/app/portainer/views/users/users.html
@@ -6,7 +6,7 @@
   </rd-header-title>
   <rd-header-content>User management</rd-header-content>
 </rd-header>
-
+<rd-body>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -123,3 +123,4 @@
     ></users-datatable>
   </div>
 </div>
+</rd-body>
\ No newline at end of file