diff --git a/Implementation-guide.md b/Implementation-guide.md
new file mode 100644
index 00000000..1d3c9ed9
--- /dev/null
+++ b/Implementation-guide.md
@@ -0,0 +1,89 @@
+# Implementation Guide
+
+Much of the benefit of this plugin will be realized when other plugins that
+enhance Jenkins offer support for it.
+
+## Add support in your plugin
+
+- Extend the DashboardPortlet class and provide a descriptor that
+  extends the `Descriptor<DashboardPortlet>`
+- Create a jelly view called *portlet.jelly*
+- Optionally create a jelly view called *main.jelly* to be used when the portlet
+  is in maximized mode (otherwise the same *portlet.jelly* view will be used)
+
+It is possible to define custom parameters for the DashboardPortlet. The
+displayName is always required. To add new parameters:
+
+- create a jelly file called *config.jelly* to be used when the portlet is
+  configured (added to the view in 'Edit View' config page);
+- modify constructor (with `@DataBoundConstructor`) to receive the new
+  parameters.
+
+Looking at the source code of this plugin will show a number of examples
+of doing this. The core portlets do the same thing that your plugin
+would do.
+
+## Sample files
+
+***MyPortlet.java***
+
+```
+import hudson.plugins.view.dashboard.DashboardPortlet;
+
+class MyPortlet extends DashboardPortlet {
+
+    @DataBoundConstructor
+    public MyPortlet(String name) {
+        super(name);
+    }
+
+// do whatever you want
+
+    @Extension
+    public static class DescriptorImpl extends Descriptor<DashboardPortlet> {
+        @Override
+        public String getDisplayName() {
+            return "MyPortlet";
+        }
+    }
+};
+```
+
+***portlet.jelly***
+
+If you want to show a single table inside the portlet use *dp:decorate-table*. This ensures that the table is properly
+rendered and really fills the complete area (The default styling of Jenkins adds rounded borders everywhere and a margin
+at the bottom that make it look not so nice).<br/>
+You can pass additional classes to be set on the table, e.g. to make it sortable.<br/>
+```
+<j:jelly xmlns:j="jelly:core" xmlns:dp="/hudson/plugins/view/dashboard">
+
+  <dp:decorate-table portlet="${it}" class="sortable"> <!-- This is to say that this is a dashboard view portlet for a table-->
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <j:forEach var="col"  items="${it.myitems}">
+        <tr>
+          <td>${col.name}</td>
+          <td>${col.description}</td>
+        </tr>
+      </j:forEach>
+    </tbody>
+  </dp:decorate-table>
+</j:jelly>
+```
+
+To show any other kind of content use *dp:decorate-plain*
+```
+<j:jelly xmlns:j="jelly:core" xmlns:dp="/hudson/plugins/view/dashboard">
+
+  <dp:decorate-plain portlet="${it}"> <!-- This is to say that this is a dashboard view portlet -->
+      <!-- you can include a separate file with the logic to display your data or you can write here directly -->
+        <st:include page="myportlet.jelly"/>
+  </dp:decorate-plain>
+</j:jelly>
+```
diff --git a/README.md b/README.md
index f4c91dcd..c4680e3c 100644
--- a/README.md
+++ b/README.md
@@ -152,76 +152,7 @@ to reformat Java code in the proper style.
 
 ## Extending the Dashboard View plugin
 
-Much of the benefit of this plugin will be realized when other plugins that
-enhance Jenkins offer support for it.
-
-Add support in your plugin:
-
-- Extend the DashboardPortlet class and provide a descriptor that
-  extends the `Descriptor<DashboardPortlet>`
-- Create a jelly view called portlet.jelly
-- Optionally create a jelly view called main.jelly to be used when the portlet
-  is in maximized mode (otherwise the same portlet.jelly view will be used)
-
-It is possible to define custom parameters for the DashboardPortlet. The
-displayName is always required. To add new parameters:
-
-- create a jelly file called config.jelly to be used when the portlet is
-  configured (added to the view in 'Edit View' config page);
-- modify constructor (with `@DataBoundConstructor`) to receive the new
-  parameters.
-
-Looking at the source code of this plugin will show a number of examples
-of doing this. The core portlets do the same thing that your plugin
-would do.
-
-Please update the list below with a [pull request] against this repository.
-
-Sample files:
-
-**MyPortlet.java**:
-
-```
-import hudson.plugins.view.dashboard.DashboardPortlet;
-
-class MyPortlet extends DashboardPortlet {
-
-    @DataBoundConstructor
-    public MyPortlet(String name) {
-        super(name);
-    }
-
-// do whatever you want
-
-    @Extension
-    public static class DescriptorImpl extends Descriptor<DashboardPortlet> {
-        @Override
-        public String getDisplayName() {
-            return "MyPortlet";
-        }
-    }
-};
-```
-
-**portlet.jelly**:
-
-```
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
-  xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout"
-  xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-
-  <dp:decorate portlet="${it}"> <!-- This is to say that this is a dashboard view portlet -->
-    <tr><td> <!-- This is needed because everything is formatted as a table - ugly, I know -->
-
-      <!-- you can include a separate file with the logic to display your data or you can write here directly -->
-      <div align="center">
-        <st:include page="myportlet.jelly"/>
-       </div>
-
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
-```
+Read the [Implementation guide](Implementation-guide.md) if you want to write your own portlet for your plugin.
 
 ## Other plugins that support the Dashboard View
 
@@ -273,7 +204,6 @@ This plugin is licensed under the MIT License (MIT), see [LICENSE](LICENSE).
 
 ## TODO
 
-- Use `<div>` instead of `<table>` to place portlets in the page.
 - Update this README with more screenshots.
 
 
diff --git a/pom.xml b/pom.xml
index 4fdea43a..de2bc395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     <revision>2</revision>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-    <jenkins.version>2.401.3</jenkins.version>
+    <jenkins.version>2.426.2</jenkins.version>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
 
@@ -53,7 +53,7 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.401.x</artifactId>
+        <artifactId>bom-2.426.x</artifactId>
         <version>2675.v1515e14da_7a_6</version>
         <type>pom</type>
         <scope>import</scope>
@@ -62,6 +62,10 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>ionicons-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
diff --git a/src/main/java/hudson/plugins/view/dashboard/core/JobsPortlet.java b/src/main/java/hudson/plugins/view/dashboard/core/JobsPortlet.java
index e666528c..7e723f54 100644
--- a/src/main/java/hudson/plugins/view/dashboard/core/JobsPortlet.java
+++ b/src/main/java/hudson/plugins/view/dashboard/core/JobsPortlet.java
@@ -21,6 +21,7 @@ public class JobsPortlet extends DashboardPortlet {
     private static final int MIN_COLUMN_COUNT = 3;
 
     private final int columnCount;
+
     private boolean fillColumnFirst = false;
 
     @DataBoundConstructor
@@ -30,13 +31,17 @@ public JobsPortlet(String name, int columnCount, boolean fillColumnFirst) {
         this.fillColumnFirst = fillColumnFirst;
     }
 
+    public boolean isFillColumnFirst() {
+        return fillColumnFirst;
+    }
+
     public int getColumnCount() {
         return columnCount <= 0 ? MIN_COLUMN_COUNT : columnCount;
     }
 
     public List<List<Job>> getJobs() {
         List<Job> jobs = this.getDashboard().getJobs();
-        Collections.sort(jobs, (p1, p2) -> p1.getDisplayName().compareToIgnoreCase(p2.getDisplayName()));
+        Collections.sort(jobs, (p1, p2) -> p1.getFullDisplayName().compareToIgnoreCase(p2.getFullDisplayName()));
 
         if (this.fillColumnFirst) {
             return transposed(jobs);
diff --git a/src/main/java/hudson/plugins/view/dashboard/stats/StatJobs.java b/src/main/java/hudson/plugins/view/dashboard/stats/StatJobs.java
index 3b3f8ee3..ccb2c1d9 100644
--- a/src/main/java/hudson/plugins/view/dashboard/stats/StatJobs.java
+++ b/src/main/java/hudson/plugins/view/dashboard/stats/StatJobs.java
@@ -2,7 +2,6 @@
 
 import hudson.Extension;
 import hudson.model.Descriptor;
-import hudson.model.Hudson;
 import hudson.model.Job;
 import hudson.model.TopLevelItem;
 import hudson.plugins.view.dashboard.DashboardPortlet;
@@ -34,19 +33,22 @@ public StatJobs(String name) {
      */
     @Deprecated
     public enum HealthStatus {
-        HEALTH_OVER_80("health-80plus.gif", Messages.Dashboard_NoRecentBuildsFailed()),
-        HEALTH_60_TO_79("health-60to79.gif", Messages.Dashboard_RecentBuildsFailed("20", "40")),
-        HEALTH_40_TO_59("health-40to59.gif", Messages.Dashboard_RecentBuildsFailed("40", "60")),
-        HEALTH_20_TO_39("health-20to39.gif", Messages.Dashboard_RecentBuildsFailed("60", "80")),
-        HEALTH_0_TO_19("health-00to19.gif", Messages.Dashboard_AllRecentBuildsFailed()),
-        HEALTH_UNKNOWN("empty.gif", Messages.Dashboard_UnknownStatus());
+        HEALTH_OVER_80("symbol-weather-icon-health-80plus", Messages.Dashboard_NoRecentBuildsFailed(), 100),
+        HEALTH_60_TO_79("symbol-weather-icon-health-60to79", Messages.Dashboard_RecentBuildsFailed("20", "40"), 80),
+        HEALTH_40_TO_59("symbol-weather-icon-health-40to59", Messages.Dashboard_RecentBuildsFailed("40", "60"), 60),
+        HEALTH_20_TO_39("symbol-weather-icon-health-20to39", Messages.Dashboard_RecentBuildsFailed("60", "80"), 40),
+        HEALTH_0_TO_19("symbol-weather-icon-health-00to19", Messages.Dashboard_AllRecentBuildsFailed(), 20),
+        HEALTH_UNKNOWN("symbol-indeterminate", Messages.Dashboard_UnknownStatus(), 0);
         // private HealthReport healthReport;
-        private final String iconUrl;
+        private final String iconClassName;
         private final String description;
 
-        HealthStatus(String iconUrl, String description) {
-            this.iconUrl = iconUrl;
+        private int score;
+
+        HealthStatus(String iconClassName, String description, int score) {
+            this.iconClassName = iconClassName;
             this.description = description;
+            this.score = score;
         }
 
         public static HealthStatus getHealthStatus(Job job) {
@@ -67,18 +69,12 @@ public static HealthStatus getHealthStatus(Job job) {
             return job.getFirstBuild() != null ? HEALTH_OVER_80 : HEALTH_UNKNOWN;
         }
 
-        public String getIconUrl() {
-            return Hudson.RESOURCE_PATH + "/images/32x32/" + iconUrl;
+        public String getIconClassName() {
+            return iconClassName;
         }
 
-        public String getIconUrl(String size) {
-            if (iconUrl == null) {
-                return Hudson.RESOURCE_PATH + "/images/" + size + "/" + HEALTH_UNKNOWN.getIconUrl();
-            }
-            if (iconUrl.startsWith("/")) {
-                return iconUrl.replace("/32x32/", "/" + size + "/");
-            }
-            return Hudson.RESOURCE_PATH + "/images/" + size + "/" + iconUrl;
+        public int getScore() {
+            return score;
         }
 
         public String getDescription() {
diff --git a/src/main/resources/hudson/plugins/view/dashboard/Dashboard/configure-entries.jelly b/src/main/resources/hudson/plugins/view/dashboard/Dashboard/configure-entries.jelly
index aa0f8c1a..13199217 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/Dashboard/configure-entries.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/Dashboard/configure-entries.jelly
@@ -1,89 +1,91 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<!--
-  Edit View Page
--->
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <st:include page="configure-entries.jelly" class="${it.class.superclass}"/>
-
-  <f:section title="${%Dashboard Portlets}">
-    <f:block>
-      <f:checkbox name="includeStdJobList" field="includeStdJobList" />
-      ${%Show standard Jenkins list at the top of the page}
-    </f:block>
-    <f:block>
-      <f:checkbox name="hideJenkinsPanels" field="hideJenkinsPanels" />
-      ${%Full screen view - hide standard Jenkins panels}
-    </f:block>
-    <f:optionalBlock name="useCssStyle" title="${%Set CSS custom parameters}"
-                   checked="${it.useCssStyle}">
-      <f:entry title="${%Left portlet width}" help="/plugin/dashboard-view/help/help-configPortletWidth.html">
-        <f:textbox name="leftPortletWidth" field="leftPortletWidth" />
-      </f:entry>
-
-      <f:entry title="${%Right portlet width}" help="/plugin/dashboard-view/help/help-configPortletWidth.html">
-        <f:textbox name="rightPortletWidth" field="rightPortletWidth" />
-      </f:entry>
-    </f:optionalBlock>
-  </f:section>
-
-  <j:set var="descriptors" value="${it.getSortedDashboardPortletDescriptors()}" />
-
-  <f:section title="${%Portlets at the top of the page}">
-    <f:block>
-      <f:hetero-list name="topPortlet" hasHeader="true"
-                     descriptors="${descriptors}"
-                     items="${it.topPortlets}"
-                     addCaption="${%Add Dashboard Portlet to the top of the view}"/>
-    </f:block>
-  </f:section>
-  <f:section title="${%Portlets in the left column}">
-    <f:block>
-      <f:hetero-list name="leftPortlet" hasHeader="true"
-                     descriptors="${descriptors}"
-                     items="${it.leftPortlets}"
-                     addCaption="${%Add Dashboard Portlet to left column}"/>
-    </f:block>
-  </f:section>
-  <f:section title="${%Portlets in the right column}">
-    <f:block>
-      <f:hetero-list name="rightPortlet" hasHeader="true"
-                     descriptors="${descriptors}"
-                     items="${it.rightPortlets}"
-                     addCaption="${%Add Dashboard Portlet to right column}"/>
-    </f:block>
-  </f:section>
-  <f:section title="${%Portlets at the bottom of the page}">
-    <f:block>
-      <f:hetero-list name="bottomPortlet" hasHeader="true"
-                     descriptors="${descriptors}"
-                     items="${it.bottomPortlets}"
-                     addCaption="${%Add Dashboard Portlet to bottom of the view}"/>
-    </f:block>
-    <p/>
-  </f:section>
-
-</j:jelly>
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+  Edit View Page
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+  <st:include page="configure-entries.jelly" class="${it.class.superclass}"/>
+
+  <f:section title="${%Dashboard Portlets}">
+    <f:entry title="${%Show standard Jenkins list at the top of the page}">
+      <f:checkbox name="includeStdJobList" field="includeStdJobList" />
+    </f:entry>
+    <f:entry title="${%Full screen view - hide standard Jenkins panels}">
+      <f:checkbox name="hideJenkinsPanels" field="hideJenkinsPanels" />
+    </f:entry>
+    <f:optionalBlock name="useCssStyle" title="${%Set CSS custom parameters}"
+                   checked="${it.useCssStyle}">
+      <f:entry title="${%Left portlet width}" help="/plugin/dashboard-view/help/help-configPortletWidth.html">
+        <f:textbox name="leftPortletWidth" field="leftPortletWidth" />
+      </f:entry>
+
+      <f:entry title="${%Right portlet width}" help="/plugin/dashboard-view/help/help-configPortletWidth.html">
+        <f:textbox name="rightPortletWidth" field="rightPortletWidth" />
+      </f:entry>
+    </f:optionalBlock>
+  </f:section>
+
+  <j:set var="descriptors" value="${it.getSortedDashboardPortletDescriptors()}" />
+
+  <f:section title="${%Portlets at the top of the page}">
+    <f:block>
+      <f:hetero-list name="topPortlet" hasHeader="true"
+                     descriptors="${descriptors}"
+                     items="${it.topPortlets}"
+                     addCaption="${%Add Dashboard Portlet to the top of the view}"
+                     oneEach="true"/>
+    </f:block>
+  </f:section>
+  <f:section title="${%Portlets in the left column}">
+    <f:block>
+      <f:hetero-list name="leftPortlet" hasHeader="true"
+                     descriptors="${descriptors}"
+                     items="${it.leftPortlets}"
+                     addCaption="${%Add Dashboard Portlet to left column}"
+                     oneEach="true"/>
+    </f:block>
+  </f:section>
+  <f:section title="${%Portlets in the right column}">
+    <f:block>
+      <f:hetero-list name="rightPortlet" hasHeader="true"
+                     descriptors="${descriptors}"
+                     items="${it.rightPortlets}"
+                     addCaption="${%Add Dashboard Portlet to right column}"
+                     oneEach="true"/>
+    </f:block>
+  </f:section>
+  <f:section title="${%Portlets at the bottom of the page}">
+    <f:block>
+      <f:hetero-list name="bottomPortlet" hasHeader="true"
+                     descriptors="${descriptors}"
+                     items="${it.bottomPortlets}"
+                     addCaption="${%Add Dashboard Portlet to bottom of the view}"
+                     oneEach="true"/>
+    </f:block>
+    <p/>
+  </f:section>
+
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/Dashboard/main.jelly b/src/main/resources/hudson/plugins/view/dashboard/Dashboard/main.jelly
index 2d5a8d4d..a0526bb2 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/Dashboard/main.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/Dashboard/main.jelly
@@ -45,85 +45,49 @@
       </j:choose>
 
       <j:if test="${it.isIncludeStdJobList()}">
-        <t:projectView jobs="${jobs}" showViewTabs="true" columnExtensions="${it.columns}" indenter="${it.indenter}"
+        <t:projectView jobs="${it.jobs}" showViewTabs="true" columnExtensions="${it.columns}" indenter="${it.indenter}"
                        itemGroup="${it.owner.itemGroup}"/>
       </j:if>
-
-      <!-- Table with 1 cell -->
-      <table align="center" border="0" cellpadding="5" cellspacing="0" width="100%">
-        <tbody>
-          <tr>
-
-            <j:if test="${!empty(it.topPortlets)}">
-              <td valign="top" width="100%"> <!-- column -->
-
-                <!-- For each left column portlet, display view -->
-                <j:forEach var="p" items="${it.topPortlets}">
-                  <st:include it="${p}" page="portlet.jelly"/>
-                  <p/>
-                </j:forEach>
-
-              </td> <!-- End column -->
-            </j:if>
-
-          </tr>
-        </tbody>
-      </table> <!-- End 1 cell table -->
-      <p/>
-
-      <!-- Table with 2 cells -->
-      <table align="center" border="0" cellpadding="5" cellspacing="0" width="100%">
-        <tbody>
-          <tr>
-
-            <j:if test="${!empty(it.leftPortlets)}">
-              <td valign="top" width="${leftWidth}"> <!-- Left column -->
-
+      <j:if test="${!empty(it.leftPortlets) &amp;&amp; !empty(it.rightPortlets)}">
+        <j:set var="gridTemplateColumns" value="grid-template-columns: ${leftWidth} ${rightWidth}"/>
+      </j:if>
+      <div class="dbv-container" style="${gridTemplateColumns}">
+        <div class="dbv-container__top">
+          <j:if test="${!empty(it.topPortlets)}">
+            <j:forEach var="p" items="${it.topPortlets}">
+              <st:include it="${p}" page="portlet.jelly"/>
+            </j:forEach>
+          </j:if>
+        </div>
+
+        <j:if test="${!empty(it.leftPortlets)}">
+          <div class="${empty(it.rightPortlets)?'dbv-container__middle':'dbv-container__left'}" style="">
                 <!-- For each left column portlet, display view -->
                 <j:forEach var="p" items="${it.leftPortlets}">
                   <st:include it="${p}" page="portlet.jelly"/>
-                  <p/>
-                </j:forEach>
-
-              </td> <!-- End left column -->
-            </j:if>
-
-            <j:if test="${!empty(it.rightPortlets)}">
-              <td valign="top" width="${rightWidth}"> <!-- Right Column -->
-                <!-- For each right column portlet, display view -->
-                <j:forEach var="p" items="${it.rightPortlets}">
-                  <st:include it="${p}" page="portlet.jelly"/>
-                  <p/>
                 </j:forEach>
-
-              </td><!-- End right column -->
-            </j:if>
-
-          </tr>
-        </tbody>
-      </table> <!-- End 2 cell table -->
-
-      <!-- Table with 1 cell -->
-      <table align="center" border="0" cellpadding="5" cellspacing="0" width="100%">
-        <tbody>
-          <tr>
-
-            <j:if test="${!empty(it.bottomPortlets)}">
-              <td valign="top" width="100%"> <!-- column -->
-
-                <!-- For each left column portlet, display view -->
-                <j:forEach var="p" items="${it.bottomPortlets}">
-                  <st:include it="${p}" page="portlet.jelly"/>
-                  <p/>
-                </j:forEach>
-
-              </td> <!-- End column -->
-            </j:if>
-
-          </tr>
-        </tbody>
-      </table> <!-- End 1 cell table -->
-      <p/>
+          </div>
+        </j:if>
+
+        <j:if test="${!empty(it.rightPortlets)}">
+          <div class="${empty(it.leftPortlets)?'dbv-container__middle':'dbv-container__right'}" style="">
+              <!-- For each right column portlet, display view -->
+              <j:forEach var="p" items="${it.rightPortlets}">
+                <st:include it="${p}" page="portlet.jelly"/>
+              </j:forEach>
+          </div>
+        </j:if>
+        <!-- Table with 1 cell -->
+
+        <div class="dbv-container__bottom">
+          <j:if test="${!empty(it.bottomPortlets)}">
+              <!-- For each left column portlet, display view -->
+              <j:forEach var="p" items="${it.bottomPortlets}">
+                <st:include it="${p}" page="portlet.jelly"/>
+              </j:forEach>
+          </j:if>
+        </div>
+      </div>
 
       <script type="text/javascript"
         src="${rootURL}/plugin/dashboard-view/js/dashboard-view.js"></script>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/builds/LatestBuilds/latestbuilds.jelly b/src/main/resources/hudson/plugins/view/dashboard/builds/LatestBuilds/latestbuilds.jelly
index d0f25f89..cb0080a3 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/builds/LatestBuilds/latestbuilds.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/builds/LatestBuilds/latestbuilds.jelly
@@ -1,27 +1,33 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
   <j:set var="builds" value="${it.finishedBuilds}"/>
-  <table id="statistics" class="sortable pane bigtable"
-    style="margin-top: 0px;">
-    <tr style="border-top: 0px;">
-      <th tooltip="${%Build name}" align="left">${%Build name}</th>
-      <th tooltip="${%Build status}" align="left">${%Build status}</th>
-      <th tooltip="${%Build time}" align="left">${%Build time}</th>
-    </tr>
-    <j:forEach var="build" items="${builds}">
+    <thead>
       <tr>
-        <td style="border: 1px #bbb solid;">
-          <t:jobLink job="${build.parent}"/>
-        </td>
-        <td data="${it.getBuildColumnSortData(build)}">
-          <a href="${h.getRelativeLinkTo(build.parent)}/${build.number}"
-            tooltip="${empty(build.description) ? null : app.markupFormatter.translate(build.description)}">
-            <l:icon alt="${build.iconColor.description}"
-              class="${build.buildStatusIconClassName} icon-sm"/>${build.displayName}
-          </a>
-        </td>
-        <td data="${it.getTimestampSortData(build)}">${it.getTimestampString(build)}</td>
+        <th tooltip="${%Build name}" align="left">${%Build name}</th>
+        <th tooltip="${%Build status}" align="left">${%Build status}</th>
+        <th tooltip="${%Build time}" align="left">${%Build time}</th>
       </tr>
-    </j:forEach>
-  </table>
+    </thead>
+    <tbody>
+      <j:forEach var="build" items="${builds}">
+        <tr>
+          <td>
+            <div class="dbv-cell">
+              <t:jobLink job="${build.parent}"/>
+            </div>
+          </td>
+          <td data="${it.getBuildColumnSortData(build)}">
+            <div class="dbv-cell">
+              <l:icon alt="${build.iconColor.description}"
+                      class="${build.buildStatusIconClassName} icon-sm"/>
+              <a href="${h.getRelativeLinkTo(build.parent)}${build.number}" class="model-link"
+                tooltip="${empty(build.description) ? null : app.markupFormatter.translate(build.description)}">
+                ${build.displayName}
+              </a>
+            </div>
+          </td>
+          <td data="${it.getTimestampSortData(build)}">${it.getTimestampString(build)}</td>
+        </tr>
+      </j:forEach>
+    </tbody>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/builds/LatestBuilds/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/builds/LatestBuilds/portlet.jelly
index e61dce16..cd9be549 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/builds/LatestBuilds/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/builds/LatestBuilds/portlet.jelly
@@ -1,34 +1,30 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-		<st:include page="latestbuilds.jelly"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-table portlet="${it}" class="sortable jenkins-table--small">
+		<st:include page="latestbuilds.jelly"/>
+  </dp:decorate-table>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/HudsonStdJobsPortlet/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/core/HudsonStdJobsPortlet/portlet.jelly
index 88e27c7f..58c2c51e 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/core/HudsonStdJobsPortlet/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/core/HudsonStdJobsPortlet/portlet.jelly
@@ -1,38 +1,34 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}" width="1">
-    <!-- Cannot set iconSize for this projectView (it is read from a cookie and it
-         is the same for all projectViews -->
-  <!--j:set var="iconSize" value="16x16" />
-  <j:set var="subIconSize" value="16x16" /-->
-    <tr>
-      <td>
-        <t:projectView jobs="${jobs}" jobBaseUrl="" columnExtensions="${it.getDashboard().columns}"/>
-      </td>
-    </tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-plain portlet="${it}" width="1">
+    <!-- Cannot set iconSize for this projectView (it is read from a cookie and it
+         is the same for all projectViews -->
+  <!--j:set var="iconSize" value="16x16" />
+  <j:set var="subIconSize" value="16x16" /-->
+        <t:projectView jobs="${jobs}" jobBaseUrl="" columnExtensions="${it.getDashboard().columns}"/>
+  </dp:decorate-plain>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/IframePortlet/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/core/IframePortlet/portlet.jelly
index 6484e6dc..49a11cb6 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/core/IframePortlet/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/core/IframePortlet/portlet.jelly
@@ -24,29 +24,27 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-  	<tr><td>
-      <j:choose>
-        <j:when test="${it.iframeSourceValid}">
-          <div align="center" style="${it.divStyle}">
-            <j:choose>
-              <j:when test="${it.useSandbox}">
-                <iframe src="${it.effectiveUrl}" style="width:100%;height:100%;border:0;" sandbox="${it.sandboxValue}">
-                    Your browser doesn't support iframes!
-                </iframe>
-              </j:when>
-              <j:otherwise>
-                <iframe src="${it.effectiveUrl}" style="width:100%;height:100%;border:0;">
-                    Your browser doesn't support iframes!
-                </iframe>
-              </j:otherwise>
-            </j:choose>
-          </div>
-        </j:when>
-        <j:otherwise>
-          <div class="error">${%Display error: URL is invalid}</div>
-        </j:otherwise>
-      </j:choose>
-    </td></tr>
-  </dp:decorate>
+  <dp:decorate-plain portlet="${it}">
+    <j:choose>
+      <j:when test="${it.iframeSourceValid}">
+        <div style="${it.divStyle}">
+          <j:choose>
+            <j:when test="${it.useSandbox}">
+              <iframe src="${it.effectiveUrl}" style="width:100%;height:100%;border:0;" sandbox="${it.sandboxValue}">
+                  Your browser doesn't support iframes!
+              </iframe>
+            </j:when>
+            <j:otherwise>
+              <iframe src="${it.effectiveUrl}" style="width:100%;height:100%;border:0;">
+                  Your browser doesn't support iframes!
+              </iframe>
+            </j:otherwise>
+          </j:choose>
+        </div>
+      </j:when>
+      <j:otherwise>
+        <div class="error">${%Display error: URL is invalid}</div>
+      </j:otherwise>
+    </j:choose>
+  </dp:decorate-plain>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/ImagePortlet/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/core/ImagePortlet/portlet.jelly
index 6243b23d..a8383775 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/core/ImagePortlet/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/core/ImagePortlet/portlet.jelly
@@ -24,18 +24,16 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:dp="/hudson/plugins/view/dashboard">
-  <dp:decorate portlet="${it}" width="3">
-    <tr>
-      <td>
-        <j:choose>
-          <j:when test="${it.urlValid}">
-            <img src="${it.getImageUrl()}"/>
-          </j:when>
-          <j:otherwise>
-            <div class="error">${%Display error: Image URL is invalid}</div>
-          </j:otherwise>
-        </j:choose>
-      </td>
-    </tr>
-  </dp:decorate>
+  <dp:decorate-plain portlet="${it}">
+    <j:choose>
+      <j:when test="${it.urlValid}">
+        <div class="center">
+          <img src="${it.getImageUrl()}"/>
+        </div>
+      </j:when>
+      <j:otherwise>
+        <div class="error">${%Display error: Image URL is invalid}</div>
+      </j:otherwise>
+    </j:choose>
+  </dp:decorate-plain>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/config.jelly b/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/config.jelly
index 252f117f..7d2027a7 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/config.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/config.jelly
@@ -1,38 +1,37 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-  <f:entry title="${%Display name}">
-    <f:textbox name="portlet.name" field="name" default="${descriptor.getDisplayName()}"/>
-  </f:entry>
-  <f:entry title="${%Number of columns}">
-    <f:textbox name="portlet.columnCount" field="columnCount"
-      default="${descriptor.getDefaultColumnCount()}"/>
-  </f:entry>
-  <f:block>
-    <f:checkbox name="portlet.fillColumnFirst" field="fillColumnFirst"/>
-    ${%Fill column first}
-  </f:block>
-</j:jelly>
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+  <f:entry title="${%Display name}">
+    <f:textbox field="name" default="${descriptor.getDisplayName()}"/>
+  </f:entry>
+  <f:entry title="${%Number of columns}">
+    <f:textbox field="columnCount"
+      default="${descriptor.getDefaultColumnCount()}"/>
+  </f:entry>
+  <f:entry title="${%Fill column first}">
+    <f:checkbox field="fillColumnFirst"/>
+  </f:entry>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/portlet.jelly
index a5e87a19..d82ea0d6 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/portlet.jelly
@@ -7,38 +7,15 @@ SPDX-License-Identifier: MIT
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson"
   xmlns:dp="/hudson/plugins/view/dashboard">
-  <dp:decorate portlet="${it}" width="${w}">
+  <dp:decorate-table portlet="${it}" class="dbv-portlet__table--gap dbv-portlet__table--compact jenkins-table--small">
     <j:forEach var="row" items="${it.jobs}">
       <tr>
         <j:forEach var="job" items="${row}">
-          <td style="border: 1px solid #bbb;">
-            <j:if test="${job.buildable and job.hasPermission(job.BUILD)}">
-              <j:choose>
-                <j:when test="${job.parameterized}">
-                  <j:set var="title" value="${%Schedule_a_task_with_parameters(h.getRelativeDisplayNameFrom(job, itemGroup),job.taskNoun)}"/>
-                  <j:set var="buildNotification" value=""/>
-                  <j:set var="behaviourClass" value=""/>
-                </j:when>
-                <j:otherwise>
-                  <j:set var="title" value="${%Schedule_a_task(h.getRelativeDisplayNameFrom(job, itemGroup),job.taskNoun)}"/>
-                  <j:set var="buildNotification" value="${%Task_scheduled(job.taskNoun)}"/>
-                  <j:set var="behaviourClass" value="dashboard-view-job-portlet-build-button"/>
-                  <st:adjunct includes="hudson.plugins.view.dashboard.core.buildbutton"/>
-                </j:otherwise>
-              </j:choose>
-              <j:set var="isQueued" value="${app.queue.contains(job)}"/>
-              <a tooltip="${title}" class="${behaviourClass} jenkins-!-build-color"
-                data-notification="${buildNotification}"
-                href="${jobBaseUrl}${job.shortUrl}build?delay=0sec">
-                <span class="${isQueued ? 'pulse-animation': ''}">
-                  <l:icon src="symbol-play" class="icon-sm"/>
-                </span>
-              </a>
-            </j:if>
-            <t:jobLink job="${job}"/>
+          <td>
+            <dp:jobCell job="${job}" weather="true"/>
           </td>
         </j:forEach>
       </tr>
     </j:forEach>
-  </dp:decorate>
+  </dp:decorate-table>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/config.jelly b/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/config.jelly
index f398ac88..c3188570 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/config.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/config.jelly
@@ -27,10 +27,10 @@ THE SOFTWARE.
   <f:entry title="${%Display name}">
     <f:textbox name="portlet.name" field="name" default="${descriptor.getDisplayName()}" />
   </f:entry>
-  <f:entry title="${%Parameters}">
+  <f:entry title="${%Show only Failed Jobs}">
     <f:checkbox name="portlet.showOnlyFailedJobs" field="showOnlyFailedJobs" />
-	${%Show only Failed Jobs} <br/>
+  </f:entry>
+  <f:entry title="${%Recurse within folders}">
     <f:checkbox name="portlet.recurse" field="recurse" />
-	${%Recurse within folders} <br/>
   </f:entry>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet.jelly
index e38cd006..36461337 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet.jelly
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson"
   xmlns:dp="/hudson/plugins/view/dashboard">
-  <dp:decorate portlet="${it}" width="4">
+  <dp:decorate-table portlet="${it}" class="jenkins-table--small">
     <j:set var="columnExtensions" value="${it.columns}"/>
     <j:set var="unstableJobs" value="${it.getUnstableJobs(jobs)}"/>
     <j:choose>
@@ -21,35 +21,12 @@ SPDX-License-Identifier: MIT
       <j:otherwise>
         <j:forEach var="job" items="${unstableJobs}">
           <tr>
-            <td style="${indenter.getCss(j)}; border: 1px solid #BBBBBB">
-              <j:if test="${job.buildable and job.hasPermission(job.BUILD)}">
-                <j:choose>
-                  <j:when test="${job.parameterized}">
-                    <j:set var="title" value="${%Schedule_a_task_with_parameters(h.getRelativeDisplayNameFrom(job, itemGroup),job.taskNoun)}"/>
-                    <j:set var="buildNotification" value=""/>
-                    <j:set var="behaviourClass" value=""/>
-                  </j:when>
-                  <j:otherwise>
-                    <j:set var="title" value="${%Schedule_a_task(h.getRelativeDisplayNameFrom(job, itemGroup),job.taskNoun)}"/>
-                    <j:set var="buildNotification" value="${%Task_scheduled(job.taskNoun)}"/>
-                    <j:set var="behaviourClass" value="dashboard-view-job-portlet-build-button"/>
-                    <st:adjunct includes="hudson.plugins.view.dashboard.core.buildbutton"/>
-                  </j:otherwise>
-                </j:choose>
-                <j:set var="isQueued" value="${app.queue.contains(job)}"/>
-                <a tooltip="${title}" class="${behaviourClass} jenkins-!-build-color"
-                  data-notification="${buildNotification}"
-                  href="${jobBaseUrl}${job.shortUrl}build?delay=0sec">
-                  <span class="${isQueued ? 'pulse-animation': ''}">
-                    <l:icon src="symbol-play" class="icon-sm"/>
-                  </span>
-                </a>
-              </j:if>
-              <t:jobLink job="${job}"/>
+            <td>
+              <dp:jobCell job="${job}" weather="true"/>
             </td>
           </tr>
         </j:forEach>
       </j:otherwise>
     </j:choose>
-  </dp:decorate>
+  </dp:decorate-table>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet.properties b/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet.properties
index 2b99208b..ff3afa05 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet.properties
+++ b/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet.properties
@@ -1,5 +1,3 @@
 # SPDX-FileCopyrightText: \u00A9 2023 TobiX <tobias-git@23.gs>
 # SPDX-License-Identifier: MIT
-Task_scheduled={0} scheduled
-Schedule_a_task=Schedule a {1} for {0}
-Schedule_a_task_with_parameters=Schedule a {1} with parameters for {0}
+
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet_ja.properties b/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet_ja.properties
index df2f47b8..fb06d3ec 100755
--- a/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet_ja.properties
+++ b/src/main/resources/hudson/plugins/view/dashboard/core/UnstableJobsPortlet/portlet_ja.properties
@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: \u00A9 2012 Seiji Sogabe
 # SPDX-License-Identifier: MIT
 No\ unstable\ jobs=\u4E0D\u5B89\u5B9A\u30D3\u30EB\u30C9\u306A\u3057
-Schedule_a_task=\u30D3\u30EB\u30C9\u5B9F\u884C
+
diff --git a/src/main/resources/hudson/plugins/view/dashboard/decorate-plain.jelly b/src/main/resources/hudson/plugins/view/dashboard/decorate-plain.jelly
new file mode 100644
index 00000000..70485f5b
--- /dev/null
+++ b/src/main/resources/hudson/plugins/view/dashboard/decorate-plain.jelly
@@ -0,0 +1,46 @@
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+	adds a table with header row and caller adds additional rows to body
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
+         xmlns:dp="/hudson/plugins/view/dashboard">
+  <st:documentation>
+    Portlet border decoration without a table. Use this to show other content like charts.
+    <st:attribute name="portlet" use="required">
+      The portlet being rendered
+    </st:attribute>
+    <st:attribute name="width" type="number" deprecated="true">
+      Unused
+    </st:attribute>
+  </st:documentation>
+  <div class="dbv-portlet">
+    <dp:title portlet="${attrs.portlet}"/>
+    <div id="${attrs.portlet.id}" class="dbv-portlet__content">
+      <d:invokeBody />
+    </div>
+  </div>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/decorate-table.jelly b/src/main/resources/hudson/plugins/view/dashboard/decorate-table.jelly
new file mode 100644
index 00000000..ea3e13bb
--- /dev/null
+++ b/src/main/resources/hudson/plugins/view/dashboard/decorate-table.jelly
@@ -0,0 +1,52 @@
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+	adds a table with header row and caller adds additional rows to body
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
+         xmlns:dp="/hudson/plugins/view/dashboard">
+  <st:documentation><![CDATA[
+    Portlet that displays a single jenkins-table with some adjusted styling to render nicely
+    inside the portlet.
+    Do not include the <table class="jenkins-table"> definition here.
+    ]]>
+    <st:attribute name="portlet" use="required">
+      The portlet being rendered
+    </st:attribute>
+    <st:attribute name="width" type="number" deprecated="true">
+      Unused
+    </st:attribute>
+    <st:attribute name="class">
+      Additional classes applied to the table
+    </st:attribute>
+  </st:documentation>
+  <div align="center" class="dbv-portlet">
+    <dp:title portlet="${attrs.portlet}"/>
+    <table class="jenkins-table dbv-portlet__content dbv-portlet__table ${attrs.class?:''}" id="${attrs.portlet.id}">
+      <d:invokeBody />
+    </table>
+  </div>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/decorate.jelly b/src/main/resources/hudson/plugins/view/dashboard/decorate.jelly
index e8209c00..73bd1ebd 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/decorate.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/decorate.jelly
@@ -26,9 +26,11 @@ THE SOFTWARE.
 	adds a table with header row and caller adds additional rows to body
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler">
+<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
+         xmlns:dp="/hudson/plugins/view/dashboard">
   <st:documentation>
-    Portlet border decoration
+    Deprecated. Instead use <code>decorate-plain</code> or <code>decorate-table</code>.<br/>
+    Portlet border decoration. The body is wrapper inside a table.
     <st:attribute name="portlet" use="required">
       The portlet being rendered
     </st:attribute>
@@ -36,26 +38,10 @@ THE SOFTWARE.
       Unused
     </st:attribute>
   </st:documentation>
-  <div align="center">
-    <div id="title-${attrs.portlet.id}" align="left" style="border: 1px solid #999999; background-color: #F0F0F0; padding: 4px; font-weight: bold;">
-      ${attrs.portlet.displayName}
-      <a href="${attrs.portlet.url}">
-        <img id="cmdMax-${attrs.portlet.id}"
-          src="${rootURL}/plugin/dashboard-view/images/view-fullscreen.png" align="right"
-          alt="${%Click to show full-screen portlet}" tooltip="${%Click to show full-screen portlet}"
-          style="visibility: hidden; display: none;" width="16" height="16" />
-      </a>
-      <img id="cmdCol-${attrs.portlet.id}"
-        src="${rootURL}/plugin/dashboard-view/images/go-top.png" align="right"
-        alt="${%Click to collapse portlet}" tooltip="${%Click to collapse portlet}"
-        style="visibility: hidden; display: none;" width="16" height="16" />
-      <img id="cmdExp-${attrs.portlet.id}"
-        src="${rootURL}/plugin/dashboard-view/images/go-bottom.png" align="right"
-        alt="${%Click to expand portlet}" tooltip="${%Click to expand portlet}"
-        style="visibility: hidden; display: none;" width="16" height="16" />
-    </div>
-  <table class="pane" id="${attrs.portlet.id}" style="margin-top: 0px; border-top: none;">
-    <d:invokeBody />
-  </table>
+  <div align="center" class="dbv-portlet">
+    <dp:title portlet="${attrs.portlet}"/>
+    <table class="dbv-portlet__content" id="${attrs.portlet.id}">
+      <d:invokeBody />
+    </table>
   </div>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/jobCell.jelly b/src/main/resources/hudson/plugins/view/dashboard/jobCell.jelly
new file mode 100644
index 00000000..0f273d0f
--- /dev/null
+++ b/src/main/resources/hudson/plugins/view/dashboard/jobCell.jelly
@@ -0,0 +1,42 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson"
+         xmlns:dp="/hudson/plugins/view/dashboard">
+  <st:documentation>
+    Displays a link to the job with a build button, optionally followed by the job weather.
+    <st:attribute name="job" type="hudson.model.Job" use="required">
+      Job object to be displayed.
+    </st:attribute>
+    <st:attribute name="weather" type="boolean">
+      Show job weather.
+    </st:attribute>
+  </st:documentation>
+  <div class="dbv-cell">
+    <j:if test="${job.buildable and job.hasPermission(job.BUILD)}">
+      <j:choose>
+        <j:when test="${job.parameterized}">
+          <j:set var="title" value="${%Schedule_a_task_with_parameters(h.getRelativeDisplayNameFrom(job, itemGroup),job.taskNoun)}"/>
+          <j:set var="buildNotification" value=""/>
+          <j:set var="behaviourClass" value=""/>
+        </j:when>
+        <j:otherwise>
+          <j:set var="title" value="${%Schedule_a_task(h.getRelativeDisplayNameFrom(job, itemGroup),job.taskNoun)}"/>
+          <j:set var="buildNotification" value="${%Task_scheduled(job.taskNoun)}"/>
+          <j:set var="behaviourClass" value="dashboard-view-job-portlet-build-button"/>
+          <st:adjunct includes="hudson.plugins.view.dashboard.core.buildbutton"/>
+        </j:otherwise>
+      </j:choose>
+      <j:set var="isQueued" value="${app.queue.contains(job)}"/>
+      <j:set var="relativeLinkToJob" value="${h.getRelativeLinkTo(job)}"/>
+      <j:set var="jobBaseUrl" value="${relativeLinkToJob.substring(0, relativeLinkToJob.length() - job.shortUrl.length())}"/>
+      <a tooltip="${title}" class="${behaviourClass} jenkins-!-build-color ${isQueued ? 'pulse-animation': ''} dbv-cell"
+         data-notification="${buildNotification}"
+         href="${jobBaseUrl}${job.shortUrl}build?delay=0sec">
+        <l:icon src="symbol-play" class="icon-sm"/>
+      </a>
+    </j:if>
+    <j:if test="${attrs.weather}">
+      <t:buildHealth td="false"/>
+    </j:if>
+    <t:jobLink job="${job}"/>
+  </div>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/portlet.properties b/src/main/resources/hudson/plugins/view/dashboard/jobCell.properties
similarity index 100%
rename from src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/portlet.properties
rename to src/main/resources/hudson/plugins/view/dashboard/jobCell.properties
diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/portlet_ja.properties b/src/main/resources/hudson/plugins/view/dashboard/jobCell_ja.properties
similarity index 100%
rename from src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/portlet_ja.properties
rename to src/main/resources/hudson/plugins/view/dashboard/jobCell_ja.properties
diff --git a/src/main/resources/hudson/plugins/view/dashboard/portlet.css b/src/main/resources/hudson/plugins/view/dashboard/portlet.css
new file mode 100644
index 00000000..8738df49
--- /dev/null
+++ b/src/main/resources/hudson/plugins/view/dashboard/portlet.css
@@ -0,0 +1,103 @@
+.dbv-container {
+  display: grid;
+  gap: 5px 10px;
+  min-width: fit-content;
+}
+
+.dbv-container__top{
+  grid-row: 1;
+  grid-column: 1 / 3;
+}
+
+.dbv-container__middle {
+  grid-row: 2;
+  grid-column: 1 / 3;
+}
+
+.dbv-container__left{
+  grid-row: 2;
+  grid-column: 1;
+}
+
+.dbv-container__right{
+  grid-row: 2;
+  grid-column: 2;
+}
+
+.dbv-container__bottom {
+  grid-row: 3;
+  grid-column: 1 / 3;
+}
+
+.dbv-portlet {
+  margin-bottom: var(--section-padding);
+  border-radius: calc(var(--table-border-radius) + 2px);
+  border: 2px solid var(--medium-grey);
+  overflow: hidden;
+}
+
+.dbv-portlet__title {
+  background-color: var(--medium-grey);
+  padding: 5px 10px;
+  font-weight: bold;
+  display: flex;
+}
+
+.dbv-portlet__title--icons {
+  margin-left: auto;
+}
+
+.dbv-portlet__table, .dbv-portlet__content #projectstatus {
+  margin-bottom: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
+
+.dbv-portlet__content .jenkins-icon-size {
+  margin-left: 5px;
+}
+
+.dbv-portlet__table--gap {
+  border-spacing: 2px;
+}
+
+.dbv-portlet__table--compact > tbody > tr > td {
+  height: auto;
+}
+
+.dbv-portlet__title-button--maximize {
+  color: var(--text-color);
+}
+
+.dbv-cell {
+  display: flex;
+  align-items: center;
+  gap: 0.4rem;
+}
+
+.dbv-cell .jenkins-icon-adjacent {
+  margin-left: 0;
+}
+
+.dbv-cell > a.model-link {
+  text-align: left;
+  width: fit-content;
+}
+
+.dbv-cell > .jenkins-table__cell--tight {
+  width: fit-content;
+}
+
+.dbv-cell svg {
+  min-width: 16px;
+}
+
+.dbv-portlet__table tr > td:last-of-type,
+.dbv-portlet__table tr > th:last-of-type{
+  padding-right: 10px!important;
+}
+
+.dbv-table__bottom--left {
+  padding-left: 1.6rem;
+}
+
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/main.jelly b/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/main.jelly
index 391eea30..e0df874b 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/main.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/main.jelly
@@ -1,34 +1,30 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-		<st:include page="statbuilds.jelly"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-plain portlet="${it}">
+		<st:include page="statbuilds.jelly"/>
+  </dp:decorate-plain>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/portlet.jelly
index 391eea30..c1fc31e8 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/portlet.jelly
@@ -1,34 +1,30 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-		<st:include page="statbuilds.jelly"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-table portlet="${it}" class="jenkins-table--small sortable">
+		<st:include page="statbuilds.jelly"/>
+  </dp:decorate-table>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/statbuilds.jelly b/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/statbuilds.jelly
index c0d5cbd6..8bf71bb0 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/statbuilds.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatBuilds/statbuilds.jelly
@@ -23,34 +23,36 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" 
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
 	<j:set var="iconSize" value="16x16" />
-	<j:set var="statsBuild" value="${it.getBuildStat(jobs)}" /> 
+	<j:set var="statsBuild" value="${it.getBuildStat(jobs)}" />
 	<j:set var="nBuilds" value="0" />
-			<table id="statistics" class="sortable pane bigtable"
-				style="margin-top: 0px;">
-				<tr style="border-top: 0px;">
-					<th tooltip="${%Status of the build}" align="left">${%Status of the build}</th>
-					<th tooltip="${%Description}" align="left">${%Description}</th>
-					<th tooltip="${%Number of builds with status}" align="left">${%Number of builds with status}</th>
-                                        <th tooltip="${%Percentage Of total builds}" align="left">${%Percentage of total builds}</th>
-				</tr>
-				<j:forEach var="col" items="${statsBuild}">
-					<j:set var="nBuilds" value="${nBuilds+col.value}" />
-				</j:forEach>
-				<j:forEach var="col" items="${statsBuild}">
-					<tr>
-						<t:ballColorTd it="${col.key}" iconSizeClass="icon-sm" />
-						<td>${col.key.description}</td>
-						<td>${col.value}</td>
-						<td>${it.roundFloatDecimal((col.value/nBuilds)*100)}</td>
-					</tr>
-				</j:forEach>
-				<tr>
-					<td><b>${%Total builds}</b></td>
-					<td>${%All builds}</td>
-					<td>${nBuilds}</td>
-				</tr>
-			</table>
+    <thead>
+      <tr>
+        <th tooltip="${%Status of the build}" align="left" class="jenkins-table__cell--tight">${%S}</th>
+        <th tooltip="${%Description}" align="left">${%Description}</th>
+        <th tooltip="${%Number of builds with status}" align="left">${%Number of builds with status}</th>
+                                      <th tooltip="${%Percentage Of total builds}" align="left">${%Percentage of total builds}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <j:forEach var="col" items="${statsBuild}">
+        <j:set var="nBuilds" value="${nBuilds+col.value}" />
+      </j:forEach>
+      <j:forEach var="col" items="${statsBuild}">
+        <tr>
+          <t:ballColorTd it="${col.key}" iconSizeClass="icon-sm" />
+          <td>${col.key.description}</td>
+          <td>${col.value}</td>
+          <td>${it.roundFloatDecimal((col.value/nBuilds)*100)}</td>
+        </tr>
+      </j:forEach>
+      <tr class="sortbottom">
+        <th></th>
+        <th align="left" class="dbv-table__bottom--left">${%Total builds}</th>
+        <th align="left" class="dbv-table__bottom--left">${nBuilds}</th>
+        <th></th>
+      </tr>
+    </tbody>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/main.jelly b/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/main.jelly
index 483c0716..dbd52d78 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/main.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/main.jelly
@@ -1,34 +1,30 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-		<st:include page="statjobs.jelly"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-plain portlet="${it}">
+		<st:include page="statjobs.jelly"/>
+  </dp:decorate-plain>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/portlet.jelly
index 483c0716..67a231c2 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/portlet.jelly
@@ -1,34 +1,30 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-		<st:include page="statjobs.jelly"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-table portlet="${it}" class="sortable jenkins-table--small">
+		<st:include page="statjobs.jelly"/>
+  </dp:decorate-table>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/statjobs.jelly b/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/statjobs.jelly
index 27b5f662..11471bd0 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/statjobs.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatJobs/statjobs.jelly
@@ -24,32 +24,36 @@ THE SOFTWARE.
 
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" 
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
-	<j:set var="iconSize" value="16x16" />
 	<j:set var="statsJob" value="${it.getJobStat(jobs)}" />
 	<j:set var="nProjects" value="0" />
-			<table id="statistics" class="sortable pane bigtable"
-				style="margin-top: 0px;">
-				<tr style="border-top: 0px;">
-					<th tooltip="${%Project health}" align="left">${%Project health}</th>
-					<th tooltip="${%Description}" align="left">${%Description}</th>
-					<th tooltip="${%Number of projects}" align="left">${%Number of projects}</th>
-				</tr>
-				<j:forEach var="col" items="${statsJob}">
-					<tr>
-						<td><img src="${rootURL}${col.key.getIconUrl(iconSize)}"
-							alt="${col.key.description}" /></td>
-						<td>${col.key.description}</td>
-						<td>${col.value}</td>
-					</tr>
-					<j:set var="nProjects" value="${nProjects+col.value}" />
-				</j:forEach>
-				<tr>
-					<td><b>${%Total projects}</b></td>
-					<td>${%All projects}</td>
-					<!-- td>${items.size()}</td -->
-					<td>${nProjects}</td>
-				</tr>
-			</table>
-</j:jelly>
\ No newline at end of file
+    <thead>
+      <tr>
+        <th tooltip="${%Project health}" align="left" class="jenkins-table__cell--tight">${%W}</th>
+        <th tooltip="${%Description}" align="left">${%Description}</th>
+        <th tooltip="${%Number of projects}" align="right">${%Number of projects}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <j:forEach var="col" items="${statsJob}">
+        <tr>
+          <td data="${col.key.score}" class="jenkins-table__cell--tight">
+            <div class="jenkins-table__cell__button-wrapper">
+              <l:icon src="${col.key.iconClassName}"
+              alt="${col.key.description}" class="icon-sm"/>
+            </div>
+          </td>
+          <td data="${col.key.score}">${col.key.description}</td>
+          <td data="${col.value}" align="right">${col.value}</td>
+        </tr>
+        <j:set var="nProjects" value="${nProjects+col.value}" />
+      </j:forEach>
+      <tr class="sortbottom">
+        <th/>
+        <th align="left" class="dbv-table__bottom--left">${%Total projects}</th>
+        <!-- td>${items.size()}</td -->
+        <th align="right">${nProjects}</th>
+      </tr>
+    </tbody>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/main.jelly b/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/main.jelly
index 7d704017..e692f372 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/main.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/main.jelly
@@ -2,13 +2,7 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
   xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson"
   xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr>
-      <td>
-        <div align="center">
-          <st:include page="statagents.jelly"/>
-        </div>
-      </td>
-    </tr>
-  </dp:decorate>
+  <dp:decorate-plain portlet="${it}">
+    <st:include page="statagents.jelly"/>
+  </dp:decorate-plain>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/poller.js b/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/poller.js
new file mode 100644
index 00000000..12f75c6e
--- /dev/null
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/poller.js
@@ -0,0 +1,31 @@
+let err = 0;
+function repeat() {
+  buildStat.getStats(function(t) {
+    let tables = document.querySelectorAll(".dbv-agents-table");
+    for (let table of tables) {
+      let tableId = table.id;
+      if (t.status === 200) {
+        err = 0;
+        let stats = t.responseObject();
+        document.getElementById('agents-' + tableId).innerText = stats.agents;
+        document.getElementById('onlineAgents-' + tableId).innerText = stats.onlineAgents;
+        document.getElementById('offlineAgents-' + tableId).innerText = stats.offlineAgents;
+        document.getElementById('disconnectedAgents-' + tableId).innerText = stats.disconnectedAgents;
+        document.getElementById('tasksInQueue-' + tableId).innerText = stats.tasksInQueue;
+        document.getElementById('runningJobs-' + tableId).innerText = stats.runningJobs;
+      } else if (t.status === 503 || t.status === 0) {
+        // Consider these recoverable and don't update error count
+        document.getElementById('runningJobs-' + tableId).innerText = 'ERR-' +
+          (t.status === 0)? 'OFFLINE' : 'PROXY';
+      } else {
+        err++;
+        document.getElementById('runningJobs-' + tableId).innerText = 'ERR-' + err;
+      }
+    }
+
+    if (err < 5) {
+      setTimeout('repeat()', 2500);
+    }
+  });
+}
+repeat();
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/portlet.jelly
index 7d704017..d2ddfcd4 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/portlet.jelly
@@ -1,14 +1,6 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
-  xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson"
-  xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr>
-      <td>
-        <div align="center">
-          <st:include page="statagents.jelly"/>
-        </div>
-      </td>
-    </tr>
-  </dp:decorate>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:dp="/hudson/plugins/view/dashboard">
+  <dp:decorate-table portlet="${it}" class="jenkins-table--small dbv-agents-table">
+      <st:include page="statagents.jelly"/>
+  </dp:decorate-table>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/statagents.jelly b/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/statagents.jelly
index 0bfb35f1..48792cbf 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/statagents.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/stats/StatSlaves/statagents.jelly
@@ -1,38 +1,10 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler"
   xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
-  <script>
-    var buildStat = <st:bind value="${it}"/>;
-    var err = 0;
-    function repeat() {
-      buildStat.getStats(function(t) {
-        if (t.status === 200) {
-          err = 0;
-          var stats = t.responseObject();
-          document.getElementById('agents-${it.id}').innerText = stats.agents;
-          document.getElementById('onlineAgents-${it.id}').innerText = stats.onlineAgents;
-          document.getElementById('offlineAgents-${it.id}').innerText = stats.offlineAgents;
-          document.getElementById('disconnectedAgents-${it.id}').innerText = stats.disconnectedAgents;
-          document.getElementById('tasksInQueue-${it.id}').innerText = stats.tasksInQueue;
-          document.getElementById('runningJobs-${it.id}').innerText = stats.runningJobs;
-        } else if (t.status === 503 || t.status === 0) {
-          // Consider these recoverable and don't update error count
-          document.getElementById('runningJobs-${it.id}').innerText = 'ERR-' +
-            (t.status === 0)? 'OFFLINE' : 'PROXY';
-        } else {
-          err++;
-          document.getElementById('runningJobs-${it.id}').innerText = 'ERR-' + err;
-        }
-
-        if (err &lt; 5) {
-          setTimeout('repeat()', 2500);
-        }
-      });
-    }
-    repeat();
-  </script>
-  <table id="statistics" class="sortable pane bigtable" style="margin-top: 0px;">
-    <tr style="border-top: 0px;">
+  <st:bind var="buildStat" value="${it}"/>
+  <st:adjunct includes="hudson.plugins.view.dashboard.stats.StatSlaves.poller"/>
+  <thead>
+    <tr>
       <th align="left">${%Agents}</th>
       <th align="left">${%Online agents}</th>
       <th align="left">${%Offline agents}</th>
@@ -40,6 +12,8 @@
       <th align="left">${%Tasks in queue}</th>
       <th align="left">${%Running jobs}</th>
     </tr>
+  </thead>
+  <tbody>
     <tr>
       <td>
         <div id="agents-${it.id}" />
@@ -60,5 +34,5 @@
         <div id="runningJobs-${it.id}" />
       </td>
     </tr>
-  </table>
+  </tbody>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsChart/main.jelly b/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsChart/main.jelly
index 6c5b75f5..ec124787 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsChart/main.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsChart/main.jelly
@@ -1,34 +1,30 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-        <img id="graph" src="${it.url}../../summaryGraph/png?width=600&amp;height=440" lazymap="${it.url}../../summaryGraph/map" alt="[Test Summary graph]"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-plain portlet="${it}">
+    <img id="graph" src="${it.url}../../summaryGraph/png?width=600&amp;height=440" lazymap="${it.url}../../summaryGraph/map" alt="[Test Summary graph]"/>
+  </dp:decorate-plain>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsChart/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsChart/portlet.jelly
index c48f5aae..f7f16e4a 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsChart/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsChart/portlet.jelly
@@ -1,34 +1,32 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-        <img id="graph" src="${it.url}summaryGraph/png" lazymap="${it.url}summaryGraph/map" alt="[Test Summary graph]"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-plain portlet="${it}">
+    <div class="center">
+      <img id="graph" src="${it.url}summaryGraph/png" lazymap="${it.url}summaryGraph/map" alt="[Test Summary graph]"/>
+    </div>
+  </dp:decorate-plain>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsPortlet/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsPortlet/portlet.jelly
index 5d585ea1..ae9a13f7 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsPortlet/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsPortlet/portlet.jelly
@@ -1,34 +1,30 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-		<st:include page="teststatistics.jelly"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-table portlet="${it}" class="sortable jenkins-table--small">
+		<st:include page="teststatistics.jelly"/>
+  </dp:decorate-table>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsPortlet/teststatistics.jelly b/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsPortlet/teststatistics.jelly
index 0a4afeca..6b0186d5 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsPortlet/teststatistics.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/test/TestStatisticsPortlet/teststatistics.jelly
@@ -5,113 +5,114 @@
   </j:new>
   <j:set var="summary" value="${it.getTestResultSummary(jobs)}"/>
 
-  <table id="testgrid" class="sortable pane bigtable"
-    style="margin-top: 0px;">
-    <tr style="border-top: 0px;">
-      <th class="pane-header" align="left" initialSortDir="down">${%Job}</th>
-      <th class="pane-header" align="right">${%Success} #</th>
-      <th class="pane-header" align="right">%</th>
-      <th class="pane-header" align="right">${%Failed} #</th>
-      <th class="pane-header" align="right">%</th>
-      <th class="pane-header" align="right">${%Skipped} #</th>
-      <th class="pane-header" align="right">%</th>
-      <th class="pane-header" align="right">${%Total} #</th>
+  <thead>
+    <tr>
+      <th align="left" initialSortDir="down">${%Job}</th>
+      <th align="right">${%Success} #</th>
+      <th align="right">%</th>
+      <th align="right">${%Failed} #</th>
+      <th align="right">%</th>
+      <th align="right">${%Skipped} #</th>
+      <th align="right">%</th>
+      <th align="right">${%Total} #</th>
     </tr>
-    <j:if test="${it.useBackgroundColors}">
-      <j:forEach var="tr" items="${summary.testResults}">
-        <tr style="border: 1px #bbb solid;">
-          <td align="left" style="vertical-align:middle" height="50"
-            bgcolor="#${it.getRowColor(tr)}">
-            <font size="+1">
-              <t:jobLink job="${tr.job}"/>
-            </font>
-          </td>
-          <td align="right" style="vertical-align:middle" bgcolor="#${it.successColor}">
-            <font size="+1">${tr.success}</font>
-          </td>
-          <td align="right" style="vertical-align:middle" bgcolor="#${it.successColor}">
-            <font size="+1">${it.format(format, tr.successPct)}</font>
-          </td>
-          <td align="right" style="vertical-align:middle" bgcolor="#${it.failureColor}">
-            <font size="+1">${tr.failed}</font>
-          </td>
-          <td align="right" style="vertical-align:middle" bgcolor="#${it.failureColor}">
-            <font size="+1">${it.format(format, tr.failedPct)}</font>
-          </td>
-          <td align="right" style="vertical-align:middle" bgcolor="#${it.skippedColor}">
-            <font size="+1">${tr.skipped}</font>
-          </td>
-          <td align="right" style="vertical-align:middle" bgcolor="#${it.skippedColor}">
-            <font size="+1">${it.format(format, tr.skippedPct)}</font>
-          </td>
-          <td align="right" style="vertical-align:middle" bgcolor="#${it.getRowColor(tr)}">
-            <font size="+1">${tr.tests}</font>
-          </td>
-        </tr>
-      </j:forEach>
-
-      <tr class="sortbottom">
-        <td class="pane-header" height="50" align="left" style="vertical-align:middle"
-          bgcolor="#${it.getTotalRowColor(summary.testResults)}">
-          <font size="+1">${%Total}</font>
+  </thead>
+  <j:if test="${it.useBackgroundColors}">
+    <j:forEach var="tr" items="${summary.testResults}">
+      <tr>
+        <td align="left"
+          bgcolor="#${it.getRowColor(tr)}">
+          <div class="dbv-cell">
+            <t:jobLink job="${tr.job}"/>
+          </div>
         </td>
-        <td class="pane-header" align="right" style="vertical-align:middle"
-          bgcolor="#${it.successColor}">
-          <font size="+1">${summary.success}</font>
+        <td align="right" bgcolor="#${it.successColor}">
+          ${tr.success}
         </td>
-        <td class="pane-header" align="right" style="vertical-align:middle"
-          bgcolor="#${it.successColor}">
-          <font size="+1">${it.format(format, summary.successPct)}</font>
+        <td align="right" bgcolor="#${it.successColor}">
+          ${it.format(format, tr.successPct)}
         </td>
-        <td class="pane-header" align="right" style="vertical-align:middle"
-          bgcolor="#${it.failureColor}">
-          <font size="+1">${summary.failed}</font>
+        <td align="right" bgcolor="#${it.failureColor}">
+          ${tr.failed}
         </td>
-        <td class="pane-header" align="right" style="vertical-align:middle"
-          bgcolor="#${it.failureColor}">
-          <font size="+1">${it.format(format, summary.failedPct)}</font>
+        <td align="right" bgcolor="#${it.failureColor}">
+          ${it.format(format, tr.failedPct)}
         </td>
-        <td class="pane-header" align="right" style="vertical-align:middle"
-          bgcolor="#${it.skippedColor}">
-          <font size="+1">${summary.skipped}</font>
+        <td align="right" bgcolor="#${it.skippedColor}">
+          ${tr.skipped}
         </td>
-        <td class="pane-header" align="right" style="vertical-align:middle"
-          bgcolor="#${it.skippedColor}">
-          <font size="+1">${it.format(format, summary.skippedPct)}</font>
+        <td align="right" bgcolor="#${it.skippedColor}">
+          ${it.format(format, tr.skippedPct)}
         </td>
-        <td class="pane-header" align="right" style="vertical-align:middle"
-          bgcolor="#${it.getTotalRowColor(summary.testResults)}">
-          <font size="+1">${summary.tests}</font>
+        <td align="right" bgcolor="#${it.getRowColor(tr)}">
+          ${tr.tests}
         </td>
       </tr>
-    </j:if>
-    <j:if test="${!it.useBackgroundColors}">
-      <j:forEach var="tr" items="${summary.testResults}">
-        <tr style="border: 1px #bbb solid;">
-          <td align="left">
-            <t:jobLink job="${tr.job}"/>
-          </td>
-          <td align="right">${tr.success}</td>
-          <td align="right">${it.format(format, tr.successPct)}</td>
-          <td align="right">${tr.failed}</td>
-          <td align="right">${it.format(format, tr.failedPct)}</td>
-          <td align="right">${tr.skipped}</td>
-          <td align="right">${it.format(format, tr.skippedPct)}</td>
-          <td align="right">${tr.tests}</td>
-        </tr>
-      </j:forEach>
+    </j:forEach>
 
-      <tr class="sortbottom">
-        <td class="pane-header" align="left">${%Total}</td>
-        <td class="pane-header" align="right">${summary.success}</td>
-        <td class="pane-header" align="right">${it.format(format, summary.successPct)}</td>
-        <td class="pane-header" align="right">${summary.failed}</td>
-        <td class="pane-header" align="right">${it.format(format, summary.failedPct)}</td>
-        <td class="pane-header" align="right">${summary.skipped}</td>
-        <td class="pane-header" align="right">${it.format(format, summary.skippedPct)}</td>
-        <td class="pane-header" align="right">${summary.tests}</td>
+    <tr class="sortbottom">
+      <th align="left" class="dbv-table__bottom--left"
+        bgcolor="#${it.getTotalRowColor(summary.testResults)}">
+        ${%Total}
+      </th>
+      <th align="right"
+        bgcolor="#${it.successColor}">
+        ${summary.success}
+      </th>
+      <th align="right"
+        bgcolor="#${it.successColor}">
+        ${it.format(format, summary.successPct)}
+      </th>
+      <th align="right"
+        bgcolor="#${it.failureColor}">
+        ${summary.failed}
+      </th>
+      <th align="right"
+        bgcolor="#${it.failureColor}">
+        ${it.format(format, summary.failedPct)}
+      </th>
+      <th align="right"
+        bgcolor="#${it.skippedColor}">
+        ${summary.skipped}
+      </th>
+      <th align="right"
+        bgcolor="#${it.skippedColor}">
+        ${it.format(format, summary.skippedPct)}
+      </th>
+      <th align="right"
+        bgcolor="#${it.getTotalRowColor(summary.testResults)}">
+        ${summary.tests}
+      </th>
+    </tr>
+  </j:if>
+  <j:if test="${!it.useBackgroundColors}">
+    <j:forEach var="tr" items="${summary.testResults}">
+      <tr>
+        <td align="left">
+          <div class="dbv-cell">
+            <t:jobLink job="${tr.job}"/>
+          </div>
+        </td>
+        <td align="right">${tr.success}</td>
+        <td align="right">${it.format(format, tr.successPct)}</td>
+        <td align="right">${tr.failed}</td>
+        <td align="right">${it.format(format, tr.failedPct)}</td>
+        <td align="right">${tr.skipped}</td>
+        <td align="right">${it.format(format, tr.skippedPct)}</td>
+        <td align="right">${tr.tests}</td>
       </tr>
-    </j:if>
+    </j:forEach>
+
+    <tr class="sortbottom">
+      <th>${%Total}</th>
+      <th align="right">${summary.success}</th>
+      <th align="right">${it.format(format, summary.successPct)}</th>
+      <th align="right">${summary.failed}</th>
+      <th align="right">${it.format(format, summary.failedPct)}</th>
+      <th align="right">${summary.skipped}</th>
+      <th align="right">${it.format(format, summary.skippedPct)}</th>
+      <th align="right">${summary.tests}</th>
+    </tr>
+  </j:if>
 
-  </table>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/test/TestTrendChart/main.jelly b/src/main/resources/hudson/plugins/view/dashboard/test/TestTrendChart/main.jelly
index 240f13d6..89e76c06 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/test/TestTrendChart/main.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/test/TestTrendChart/main.jelly
@@ -1,34 +1,30 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-        <img id="graph" src="${it.url}../../summaryGraph/png?width=600&amp;height=440" lazymap="${it.url}../../summaryGraph/map" alt="[${%Test Summary graph}]"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-plain portlet="${it}">
+    <img id="graph" src="${it.url}../../summaryGraph/png?width=600&amp;height=440" lazymap="${it.url}../../summaryGraph/map" alt="[${%Test Summary graph}]"/>
+  </dp:decorate-plain>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/test/TestTrendChart/portlet.jelly b/src/main/resources/hudson/plugins/view/dashboard/test/TestTrendChart/portlet.jelly
index fb50ebe3..0e80557b 100644
--- a/src/main/resources/hudson/plugins/view/dashboard/test/TestTrendChart/portlet.jelly
+++ b/src/main/resources/hudson/plugins/view/dashboard/test/TestTrendChart/portlet.jelly
@@ -1,34 +1,32 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <dp:decorate portlet="${it}">
-    <tr><td>
-      <div align="center">
-        <img id="graph" src="${it.url}summaryGraph/png?width=${it.graphWidth}&amp;height=${it.graphHeight}" lazymap="${it.url}summaryGraph/map" alt="[${%Test Summary graph}]"/>
-       </div>
-     </td></tr>
-  </dp:decorate>
-</j:jelly>
\ No newline at end of file
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:dp="/hudson/plugins/view/dashboard" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <dp:decorate-plain portlet="${it}">
+    <div class="center">
+      <img id="graph" src="${it.url}summaryGraph/png?width=${it.graphWidth}&amp;height=${it.graphHeight}" lazymap="${it.url}summaryGraph/map" alt="[${%Test Summary graph}]"/>
+    </div>
+  </dp:decorate-plain>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/view/dashboard/title.jelly b/src/main/resources/hudson/plugins/view/dashboard/title.jelly
new file mode 100644
index 00000000..12da245f
--- /dev/null
+++ b/src/main/resources/hudson/plugins/view/dashboard/title.jelly
@@ -0,0 +1,59 @@
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+	adds a table with header row and caller adds additional rows to body
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
+         xmlns:dp="/hudson/plugins/view/dashboard">
+  <st:documentation>
+    Portlet border decoration without a table. Use this when the portlet itself renders a table
+    <st:attribute name="portlet" use="required">
+      The portlet being rendered
+    </st:attribute>
+  </st:documentation>
+  <st:adjunct includes="hudson.plugins.view.dashboard.portlet"/>
+  <div id="title-${attrs.portlet.id}" class="dbv-portlet__title" align="left">
+    <div>
+      ${attrs.portlet.displayName}
+    </div>
+    <div class="dbv-portlet__title--icons dbv-cell">
+      <l:icon src="symbol-arrow-up-outline plugin-ionicons-api"
+              alt="${%Click to collapse portlet}"
+              tooltip="${%Click to collapse portlet}"
+              class="icon-sm jenkins-hidden dbv-portlet__title-button--collapse"/>
+      <l:icon src="symbol-arrow-down-outline plugin-ionicons-api"
+              alt="${%Click to expand portlet}"
+              tooltip="${%Click to expand portlet}"
+              class="icon-sm jenkins-hidden dbv-portlet__title-button--expand"/>
+      <a href="${attrs.portlet.url}" class="dbv-cell">
+        <l:icon src="symbol-expand plugin-ionicons-api"
+                alt="${%Click to show full-screen portlet}"
+                tooltip="${%Click to show full-screen portlet}"
+                class="icon-sm jenkins-hidden dbv-portlet__title-button--maximize" />
+      </a>
+    </div>
+  </div>
+</j:jelly>
diff --git a/src/main/webapp/images/go-bottom.png b/src/main/webapp/images/go-bottom.png
deleted file mode 100644
index 2c5a8038..00000000
Binary files a/src/main/webapp/images/go-bottom.png and /dev/null differ
diff --git a/src/main/webapp/images/go-top.png b/src/main/webapp/images/go-top.png
deleted file mode 100644
index 70f2c996..00000000
Binary files a/src/main/webapp/images/go-top.png and /dev/null differ
diff --git a/src/main/webapp/images/view-fullscreen.png b/src/main/webapp/images/view-fullscreen.png
deleted file mode 100644
index ffdabd4e..00000000
Binary files a/src/main/webapp/images/view-fullscreen.png and /dev/null differ
diff --git a/src/main/webapp/js/dashboard-view.js b/src/main/webapp/js/dashboard-view.js
index c112f932..fa4ec3e5 100644
--- a/src/main/webapp/js/dashboard-view.js
+++ b/src/main/webapp/js/dashboard-view.js
@@ -1,70 +1,34 @@
-function getElementFromEvent(e) {
-  var targ;
-  if (e.target)
-    targ = e.target;
-  else if (e.srcElement)
-    targ = e.srcElement;
-  if (targ.nodeType == 3) // defeat Safari bug
-    targ = targ.parentNode;
-  return targ;
-}
-
-function updateIcons(elemName, param)
+function togglePortlet(portlet, show)
 {
-  var cmds = window.document.getElementsByTagName('img');
-  var collapse;
-  var expand;
-  for (var cmdIndex in cmds) {
-    cmd = cmds[cmdIndex];
-    if (cmd.id && cmd.id == ('cmdExp-'+elemName)) {
-      expand = cmd;
-    } else if (cmd.id && cmd.id == ('cmdCol-'+elemName)) {
-      collapse = cmd;
-    }
+  let content = portlet.querySelector(".dbv-portlet__content");
+  let collapse = portlet.querySelector(".dbv-portlet__title-button--collapse");
+  let expand = portlet.querySelector(".dbv-portlet__title-button--expand");
+  if (show) {
+    content.classList.remove("jenkins-hidden");
+    expand.classList.add("jenkins-hidden");
+    collapse.classList.remove("jenkins-hidden");
+  } else {
+    content.classList.add("jenkins-hidden");
+    expand.classList.remove("jenkins-hidden");
+    collapse.classList.add("jenkins-hidden");
   }
-  expand.style.visibility = (param == 'e') ? 'hidden' : 'visible';
-  expand.style.display = (param == 'e') ? 'none' : '';
-  collapse.style.visibility = (param == 'c') ? 'hidden' : 'visible';
-  collapse.style.display = (param == 'c') ? 'none' : '';
 }
 
-function myshow(e) {
-  if (!e) var e = window.event;
-  var receiver = getElementFromEvent(e);
-  var portletId = receiver.id.substring(7);
-  var elem = document.getElementById(portletId);
-  elem.style.visibility = 'visible';
-  elem.style.display = '';
+Behaviour.specify(".dbv-portlet__title-button--maximize", "dbv-maximize", 0, function(cmd) {
+    cmd.classList.remove("jenkins-hidden");
+});
 
-  updateIcons(portletId, 'e');
-}
-
-function myhide(e) {
-  if (!e) var e = window.event;
-  var receiver = getElementFromEvent(e);
-  var portletId = receiver.id.substring(7);
-  var elem = document.getElementById(portletId);
-  elem.style.visibility = 'hidden';
-  elem.style.display = 'none';
-
-  updateIcons(portletId, 'c');
-}
-
-function startsWith(str, substr) {
-  return (str.match("^"+substr) == substr);
-}
+Behaviour.specify(".dbv-portlet__title-button--collapse", "dbv-collapse", 0, function(cmd) {
+    let portlet = cmd.closest(".dbv-portlet");
+    cmd.onclick = function() {
+      togglePortlet(portlet, false);
+    }
+    cmd.classList.remove("jenkins-hidden")
+});
 
-var cmds = window.document.getElementsByTagName('img');
-for (var cmdIndex in cmds) {
-  cmd = cmds[cmdIndex];
-  if (cmd.id && startsWith(cmd.id, 'cmdExp-portlet-')) {
-    cmd.onclick = myshow;
-  } else if (cmd.id && startsWith(cmd.id, 'cmdCol-portlet-')) {
-    cmd.onclick = myhide;
-    cmd.style.visibility = 'visible';
-    cmd.style.display = '';
-  } else if (cmd.id && startsWith(cmd.id, 'cmdMax-portlet-')) {
-    cmd.style.visibility = 'visible';
-    cmd.style.display = '';
-  }
-}
+Behaviour.specify(".dbv-portlet__title-button--expand", "dbv-expand", 0, function(cmd) {
+    let portlet = cmd.closest(".dbv-portlet");
+    cmd.onclick = function() {
+      togglePortlet(portlet, true);
+    }
+});
diff --git a/src/test/java/hudson/plugins/view/dashboard/core/IFramePortletTest.java b/src/test/java/hudson/plugins/view/dashboard/core/IFramePortletTest.java
index 26a96040..0b3ee1df 100644
--- a/src/test/java/hudson/plugins/view/dashboard/core/IFramePortletTest.java
+++ b/src/test/java/hudson/plugins/view/dashboard/core/IFramePortletTest.java
@@ -99,7 +99,7 @@ public void iframePortletSandbox() throws Exception {
     }
 
     private List<HtmlInlineFrame> findIFrame(HtmlPage page) {
-        return page.getByXPath("//table[@id='portlet-bottomPortlets-0']//iframe");
+        return page.getByXPath("//div[@id='portlet-bottomPortlets-0']//iframe");
     }
 
     private List<DomNode> findError(HtmlPage page) {
diff --git a/src/test/java/hudson/plugins/view/dashboard/core/ImagePortletTest.java b/src/test/java/hudson/plugins/view/dashboard/core/ImagePortletTest.java
index f44c9ff2..900a4a4d 100644
--- a/src/test/java/hudson/plugins/view/dashboard/core/ImagePortletTest.java
+++ b/src/test/java/hudson/plugins/view/dashboard/core/ImagePortletTest.java
@@ -50,7 +50,7 @@ public void imagePortletValidation() throws Exception {
     }
 
     private List<DomNode> findImage(HtmlPage page) {
-        return page.getByXPath("//table[@id='portlet-bottomPortlets-0']//img");
+        return page.getByXPath("//div[@id='portlet-bottomPortlets-0']//img");
     }
 
     private List<DomNode> findError(HtmlPage page) {