QPID-5935: [Java Broker] Web Management UI style refactor to remove html inline styles and standardise via css

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1615606 13f79535-47bb-0310-9956-ffa450edef68

55 files changed, 384 insertions, 372 deletions

diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
index 9e3056ec91..d82f8108ee 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
@@ -15,6 +15,6 @@
   ~ limitations under the License.
   -->
 <div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <div class="infoMessage">The virtualhost will have the same name as the group.</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html
index 2df0ebb0fd..37a4c51854 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html
@@ -18,7 +18,7 @@
   -->
 <div>
 
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size (bytes):</div>
         <div class="tableContainer-valueCell formLabel-controlCell">
             <input data-dojo-type="dijit/form/NumberSpinner"
@@ -31,7 +31,7 @@
                               constraints:{min:0,places:0}"/>
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Store underfull size (bytes):</div>
         <div class="tableContainer-valueCell formLabel-controlCell">
             <input data-dojo-type="dijit/form/NumberSpinner"
@@ -45,10 +45,10 @@
         </div>
     </div>
 
-     <div class="formBox" style="clear:both">
+     <div class="formBox clear">
         <fieldset>
             <legend>Permitted group nodes</legend>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell tableContainer-labelCell">Permitted addresses*:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell addPermittedNodeList">
                     <select type="text" id="editVirtualHost.permittedNodesList"
@@ -67,8 +67,8 @@
                 <button data-dojo-type="dijit/form/Button" id="editVirtualHost.permittedNodeRemove" data-dojo-props="label: '-'" ></button>
             </div>
 
-            <div style="clear:both"></div>
-            <div style="clear:both">
+            <div class="clear"></div>
+            <div class="clear">
                 <div class="formLabel-labelCell tableContainer-labelCell">Address:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell">
                     <input type="text" id="editVirtualHost.permittedNode"
@@ -85,9 +85,9 @@
         </fieldset>
     </div>
 
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 
-    <div class="formBox" style="clear:both">
+    <div class="formBox clear">
         <fieldset>
         <legend>High availability durability</legend>
         <div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html
index 35ab0a0bcf..0c419aabae 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html
@@ -18,23 +18,23 @@
   -->
 
 <div>
-  <div style="clear:both">
+  <div class="clear">
       <div class="formLabel-labelCell">Store overfull size:</div>
       <div><span class="storeOverfullSize" ></span> bytes</div>
   </div>
-  <div style="clear:both">
+  <div class="clear">
       <div class="formLabel-labelCell">Store underfull size:</div>
       <div><span class="storeUnderfullSize"></span> bytes</div>
   </div>
-  <div style="clear:both">
+  <div class="clear">
       <div class="formLabel-labelCell">Permitted nodes:</div>
       <div class="permittedNodes multiLineValue"></div>
   </div>
-  <div style="clear:both"></div>
+  <div class="clear"></div>
   <br/>
 
   <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'High Availability Durability',  open: true">
-      <div style="clear:both">
+      <div class="clear">
           <div class="formLabel-labelCell">Master transaction sync policy:</div>
           <div class="localTransactionSynchronizationPolicy">
             <span class="localTransactionSynchronizationPolicy-sync">SYNC (the transaction will be written and synchronized to the disk; highest durability)</span>
@@ -42,7 +42,7 @@
             <span class="localTransactionSynchronizationPolicy-no_sync">NO_SYNC (write later; the transaction will be written and synchronized later; lowest durability)</span>
           </div>
       </div>
-      <div style="clear:both">
+      <div class="clear">
           <div class="formLabel-labelCell">Replica transaction sync policy:</div>
           <div class="remoteTransactionSynchronizationPolicy">
               <span class="remoteTransactionSynchronizationPolicy-sync">SYNC (the transaction will be written and synchronized to the disk; highest durability)</span>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
index a12c910ab1..f9e9d0a82f 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
@@ -19,7 +19,7 @@
  -
  -->
 <div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.storePath"
@@ -33,5 +33,5 @@
       </div>
     </div>
 
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 </div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html
index a93a11086c..09fcab4b1c 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html
@@ -15,9 +15,9 @@
   ~ limitations under the License.
   -->
 <div>
-  <div style="clear:both">
+  <div class="clear">
     <div class="formLabel-labelCell">Configuration store path:</div>
     <div class="storePath"></div>
   </div>
-  <div style="clear:both"></div>
+  <div class="clear"></div>
 </div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
index a3bfa9459d..c7e44a38b2 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
@@ -19,7 +19,7 @@
  -
  -->
 <div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Create new group or join existing group*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
           <div>
@@ -37,6 +37,6 @@
           </div>
         </div>
     </div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <div id="addVirtualHostNode.bdbha.typeFields"></div>
 </div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
index de38b553e8..eb21d9faa9 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
@@ -21,7 +21,7 @@
     <div class="formBox">
         <fieldset>
             <legend>Existing details</legend>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell tableContainer-labelCell">Group name*:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell">
                     <input type="text" id="addVirtualHostNode.groupName"
@@ -35,7 +35,7 @@
                                   pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
                 </div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell tableContainer-labelCell">Node name from group*:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell">
                     <input type="text" id="addVirtualHostNode.helperNodeName"
@@ -49,7 +49,7 @@
                                   pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
                 </div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell tableContainer-labelCell">Node address of same node*:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell">
                     <input type="text" id="addVirtualHostNode.helperAddress"
@@ -70,7 +70,7 @@
     <div class="formBox">
         <fieldset>
             <legend>New node details</legend>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell tableContainer-labelCell">Address*:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell">
                     <input type="text" id="addVirtualHostNode.address"
@@ -84,7 +84,7 @@
                               pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" />
                 </div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell">
                     <input type="text" id="addVirtualHostNode.storePath"
@@ -99,5 +99,5 @@
             </div>
         </fieldset>
      </div>
-     <div style="clear:both"></div>
+     <div class="clear"></div>
 </div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
index 642482bd4f..0fedc22107 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
@@ -18,7 +18,7 @@
   -->
 <div>
 
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Group name*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.groupName"
@@ -32,7 +32,7 @@
                               pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
       </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Address*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.address"
@@ -46,7 +46,7 @@
                               pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" />
       </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.storePath"
@@ -59,10 +59,10 @@
                               title: 'Enter store path'" />
       </div>
     </div>
-    <div class="formBox" style="clear:both">
+    <div class="clear formBox">
         <fieldset>
             <legend>Permitted group nodes</legend>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell tableContainer-labelCell">Permitted addresses*:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell addPermittedNodeList">
                     <select type="text" id="addVirtualHostNode.permittedNodesList"
@@ -76,8 +76,8 @@
                 <button data-dojo-type="dijit/form/Button" id="addVirtualHostNode.permittedNodeRemove" data-dojo-props="label: '-'" ></button>
             </div>
 
-            <div style="clear:both"></div>
-            <div style="clear:both">
+            <div class="clear"></div>
+            <div class="clear">
                 <div class="formLabel-labelCell tableContainer-labelCell">Address:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell">
                     <input type="text" id="addVirtualHostNode.permittedNode"
@@ -103,5 +103,5 @@
            data-dojo-type="dijit/form/ValidationTextBox"
            data-dojo-props="name: 'helperAddress'" />
 
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 </div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
index 026de1aa14..44b2a52536 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Replication Group*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="editVirtualHostNode.groupName"
@@ -30,7 +30,7 @@
                                     pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Address*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="editVirtualHostNode.address"
@@ -46,7 +46,7 @@
                                     pattern: '^([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}$'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="editVirtualHostNode.storePath"
@@ -59,7 +59,7 @@
                                   title: 'Enter configuration store path'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Allow this node to operate solo: </div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="checkbox" id="editVirtualHostNode.designatedPrimary" checked="checked"
@@ -70,7 +70,7 @@
                                     title: 'Designate node as primary. It is applicable only to 2-nodes cluster'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Election priority of this node: </div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodePriorityStore"
@@ -89,7 +89,7 @@
                                 searchAttr: 'name'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Required minimum number of nodes: </div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodeQuorumOverrideStore"
@@ -105,5 +105,5 @@
         </div>
     </div>
 
-    <div style="clear:both"></div>
-</div>
\ No newline at end of file
+    <div class="clear"></div>
+</div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html
index 7583eee9d4..5a60b75c5c 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html
@@ -19,37 +19,37 @@
  -
  -->
 <div>
-  <div style="clear:both">
+  <div class="clear">
       <div class="formLabel-labelCell">Group name:</div>
       <div class="groupName"></div>
   </div>
-  <div style="clear:both">
+  <div class="clear">
        <div class="formLabel-labelCell">Configuration store path:</div>
        <div class="storePath"></div>
   </div>
-  <div style="clear:both">
+  <div class="clear">
       <div class="formLabel-labelCell">Role:</div>
       <div class="role">N/A</div>
   </div>
-  <div style="clear:both">
+  <div class="clear">
       <div class="formLabel-labelCell">Address:</div>
       <div class="address">N/A</div>
   </div>
-  <div style="clear:both" class="designatedPrimaryContainer">
+  <div class="clear designatedPrimaryContainer">
     <div class="formLabel-labelCell">Allow this node to operate solo:</div>
     <div class="designatedPrimary">N/A</div>
   </div>
-  <div style="clear:both" class="priorityContainer">
+  <div class="clear priorityContainer">
       <div class="formLabel-labelCell">Election priority:</div>
       <div class="priority">Never</div>
   </div>
-  <div style="clear:both" class="quorumOverrideContainer">
+  <div class="clear quorumOverrideContainer">
       <div class="formLabel-labelCell">Required minimum number of nodes:</div>
       <div>
           <span class="quorumOverride" >N/A</span>
       </div>
   </div>
-  <div style="clear:both"></div>
+  <div class="clear"></div>
   <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Group nodes'" class="membersGridPanel">
       <div class="groupMembers"></div>
       <div class="groupMembersToolbar dijitDialogPaneActionBar">
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
index 8e50267ec7..fa4f0d64f1 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
@@ -19,7 +19,7 @@
  -
  -->
 <div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.storePath"
@@ -32,5 +32,5 @@
                               title: 'Enter store path'" />
       </div>
     </div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 </div>
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html
index 56c09a8ad7..d86d9cfa03 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 
-<div style="clear:both">
+<div class="clear">
     <div class="formLabel-labelCell">Configuration store path:</div>
     <div class="storePath"></div>
 </div>
diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html
index 8453b0618b..f4e59bfa9a 100644
--- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html
@@ -19,19 +19,19 @@
 <div>
   <br/>
   <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bone Connection Pool Settings',  open: false">
-      <div style="clear:both">
+      <div class="clear">
         <div class="formLabel-labelCell">Partition Count:</div>
         <div class="partitionCount"></div>
       </div>
-      <div style="clear:both">
+      <div class="clear">
         <div class="formLabel-labelCell">Minimum connections per Partition:</div>
         <div class="minConnectionsPerPartition"></div>
       </div>
-      <div style="clear:both">
+      <div class="clear">
           <div class="formLabel-labelCell">Maximum connections per Partition:</div>
           <div class="maxConnectionsPerPartition"></div>
       </div>
-      <div style="clear:both"></div>
+      <div class="clear"></div>
   </div>
 </div>
 
diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
index df35a3cce0..3f5c60b110 100644
--- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<div class="formBox" style="clear:both">
+<div class="clear formBox">
 <fieldset>
 <legend>BoneCP Settings</legend>
 <table class="tableContainer-table tableContainer-table-horiz">
@@ -58,4 +58,4 @@
 
 </table>
 </fieldset>
-</div>
\ No newline at end of file
+</div>
diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html
index e4334e395f..b4c60b818e 100644
--- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<div class="formBox" style="clear:both">
+<div class="clear formBox">
 <fieldset>
 <legend>BoneCP Settings</legend>
 <table class="tableContainer-table tableContainer-table-horiz">
@@ -58,4 +58,4 @@
 
 </table>
 </fieldset>
-</div>
\ No newline at end of file
+</div>
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
index cca86d8c54..7f1b97462e 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 <div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">JDBC Url*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHost.connectionUrl"
@@ -31,7 +31,7 @@
                               pattern: '^jdbc:.*:.*$'"/>
       </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Username*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="addVirtualHost.username"
@@ -44,7 +44,7 @@
                               title: 'Enter username'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Password*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="password" id="addVirtualHost.password"
@@ -57,7 +57,7 @@
                               title: 'Enter password'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Connection Pool*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHost.connectionPoolType"
@@ -71,7 +71,7 @@
       </div>
     </div>
 
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <div id="addVirtualHost.poolSpecificDiv"></div>
     <div class="infoMessage">The virtual host will have the same name as the node.</div>
 </div>
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/edit.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/edit.html
index 199d80f546..fb1b4493f1 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/edit.html
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/edit.html
@@ -18,7 +18,7 @@
   -->
 
 <div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">JDBC Url*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="editVirtualHost.connectionUrl"
@@ -32,7 +32,7 @@
                               pattern: '^jdbc:.*:.*$'"/>
       </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Username*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="editVirtualHost.username"
@@ -45,7 +45,7 @@
                               title: 'Enter username'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Password*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="password" id="editVirtualHost.password"
@@ -59,7 +59,7 @@
                               title: 'Enter password'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Connection Pool*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="editVirtualHost.connectionPoolType"
@@ -73,7 +73,7 @@
       </div>
     </div>
 
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <div id="editVirtualHost.poolSpecificDiv"></div>
 
 </div>
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
index 194a1130b4..fc2768bd43 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
@@ -19,7 +19,7 @@
  -
  -->
 <div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">JDBC Url*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.connectionUrl"
@@ -33,7 +33,7 @@
                               pattern: '^jdbc:.*:.*$'"/>
       </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Username*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="addVirtualHostNode.username"
@@ -46,7 +46,7 @@
                               title: 'Enter username'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Password*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="password" id="addVirtualHostNode.password"
@@ -59,7 +59,7 @@
                               title: 'Enter password'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Connection Pool*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.connectionPoolType"
@@ -73,6 +73,6 @@
       </div>
     </div>
 
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <div id="addVirtualHostNode.poolSpecificDiv"></div>
 </div>
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/edit.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/edit.html
index 6f2ddfff73..2c6eaf2926 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/edit.html
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/edit.html
@@ -19,7 +19,7 @@
  -
  -->
 <div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">JDBC Url*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="editVirtualHostNode.connectionUrl"
@@ -33,7 +33,7 @@
                               pattern: '^jdbc:.*:.*$'"/>
       </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Username*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="editVirtualHostNode.username"
@@ -46,7 +46,7 @@
                               title: 'Enter username'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Password*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="password" id="editVirtualHostNode.password"
@@ -59,7 +59,7 @@
                               title: 'Enter password'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Connection Pool*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="editVirtualHostNode.connectionPoolType"
@@ -73,6 +73,6 @@
       </div>
     </div>
 
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <div id="editVirtualHostNode.poolSpecificDiv"></div>
 </div>
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html
index e8640aabbd..b6145f59b6 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html
@@ -15,20 +15,20 @@
   ~ limitations under the License.
   -->
 <div>
-  <div style="clear:both">
+  <div class="clear">
     <div class="formLabel-labelCell">Connection URL:</div>
     <div class="connectionUrl"></div>
   </div>
-  <div class="usernameAttributeContainer" style="clear:both">
+  <div class="clear usernameAttributeContainer">
     <div class="formLabel-labelCell">Username:</div>
     <div class="username"></div>
   </div>
-  <div style="clear:both">
+  <div class="clear">
     <div class="formLabel-labelCell">Connection Pool Type:</div>
     <div class="connectionPoolType"></div>
   </div>
-  <div class="connectionPoolTypeAttributeContainer" style="clear:both"/>
+  <div class="clear connectionPoolTypeAttributeContainer"/>
 
-  <div style="clear:both"></div>
+  <div class="clear"></div>
 </div>
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
index 1ece4b2651..dab8541b65 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
@@ -22,7 +22,7 @@
     <div data-dojo-type="dijit.Dialog" data-dojo-props="title:'Port'" id="addPort">
         <form id="formAddPort" method="post" dojoType="dijit.form.Form">
             <div style="height:320px; width:420px; overflow: auto">
-            <div style="display:none;" id="portEditWarning">NOTE: changes will only take effect after Broker restart.</div>
+            <div class="hidden" id="portEditWarning">NOTE: changes will only take effect after Broker restart.</div>
             <div id="formAddPort:fields">
                 <input type="text" required="true" name="name" id="formAddPort.name" placeholder="Name"
                     data-dojo-props="label: 'Name*:'" dojoType="dijit.form.ValidationTextBox"
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
index 8d7d47a530..75d0888200 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
@@ -78,7 +78,7 @@
             </table>
             <br/>
 
-            <div id="formAddQueueTypePriority:fields" style="display:none"
+            <div id="formAddQueueTypePriority:fields" class="hidden"
                  data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Priority Queue Settings'">
                 <table cellpadding="0" cellspacing="2">
                     <tr>
@@ -90,7 +90,7 @@
             </div>
 
 
-            <div id="formAddQueueTypeLVQ:fields" style="display:none"
+            <div id="formAddQueueTypeLVQ:fields" class="hidden"
                  data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Last Value Queue Settings'">
                 <table cellpadding="0" cellspacing="2">
                     <tr>
@@ -101,7 +101,7 @@
                 </table>
             </div>
 
-            <div id="formAddQueueTypeSorted:fields" style="display:none"
+            <div id="formAddQueueTypeSorted:fields" class="hidden"
                  data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Sorted Queue Settings'">
                 <table cellpadding="0" cellspacing="2">
                     <tr>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
index 0a9067aa42..11173571ab 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
@@ -27,7 +27,7 @@
             <div class="formBox">
               <fieldset>
                 <legend>Virtual Host Node</legend>
-                    <div style="clear:both">
+                    <div class="clear">
                       <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
                       <div class="formLabel-controlCell tableContainer-valueCell">
                           <input type="text" id="addVirtualHostNode.nodeName"
@@ -41,7 +41,7 @@
                               pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
                       </div>
                     </div>
-                    <div style="clear:both">
+                    <div class="clear">
                         <div class="formLabel-labelCell tableContainer-labelCell">Type*:</div>
                         <div class="tableContainer-valueCell formLabel-controlCell">
                             <select id="addVirtualHostNode.type" data-dojo-type="dijit/form/FilteringSelect"
@@ -55,7 +55,7 @@
                              </select>
                         </div>
                     </div>
-                    <div style="clear:both"></div>
+                    <div class="clear"></div>
 
                     <div id="addVirtualHostNode.typeFields"></div>
                 </fieldset>
@@ -67,7 +67,7 @@
             <div class="formBox">
               <fieldset>
                 <legend>Virtual Host</legend>
-                <div style="clear:both">
+                <div class="clear">
                     <div class="formLabel-labelCell tableContainer-labelCell">Type*:</div>
                     <div class="tableContainer-valueCell formLabel-controlCell">
                         <select id="addVirtualHost.type" data-dojo-type="dijit/form/FilteringSelect"
@@ -81,7 +81,7 @@
                         </select>
                     </div>
                 </div>
-                <div style="clear:both"></div>
+                <div class="clear"></div>
 
                 <div id="addVirtualHost.typeFields"></div>
               </fieldset>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html
index f315ee3450..663415e6d5 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 
-<div style="clear:both">
+<div class="clear">
   <div class="formLabel-labelCell">Path:</div>
-  <div class="fileSystemPreferencesProviderPath" style="float:left;"></div>
+  <div class="fileSystemPreferencesProviderPath"></div>
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css b/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
index 2e1033c15e..9df7305782 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
@@ -34,6 +34,14 @@ html, body {
     color: #333;
 }
 
+.clear {
+    clear: both;
+}
+
+.hidden {
+    display: none;
+}
+
 #pageLayout {
     height: 100%;
 }
@@ -118,6 +126,10 @@ div .messages {
 .formLabel-labelCell {
     margin-left: 5px;
     float: left;
+   }
+
+.formValue-valueCell {
+    float: left;
 }
 
 .formBox .addPermittedNodeList {
@@ -225,4 +237,4 @@ div .messages {
 .editNoteBanner {
     font-style: italic;
     margin: 0px 0px 10px 5px;
-}
\ No newline at end of file
+}
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
index 1be5c5d29c..2ec1743d80 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
@@ -20,7 +20,7 @@
   <div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit Virtual Host'" id="editVirtualHostDialog">
       <form id="editVirtualHostForm" method="post" data-dojo-type="dijit/form/Form">
           <div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host restart.</div>
-          <div style="clear:both">
+          <div class="clear">
               <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
               <div class="formLabel-controlCell tableContainer-valueCell">
                   <input type="text" id="editVirtualHost.name"
@@ -37,10 +37,10 @@
 
           <div id="editVirtualHost.typeFields"></div>
 
-          <div class="formBox" style="clear:both">
+          <div class="clear formBox">
               <fieldset>
                   <legend>Store transaction settings</legend>
-                  <div style="clear:both">
+                  <div class="clear">
                       <div class="formLabel-labelCell tableContainer-labelCell">Idle Timeout Warn:</div>
                       <div class="tableContainer-valueCell formLabel-controlCell">
                           <input data-dojo-type="dijit/form/NumberSpinner"
@@ -52,7 +52,7 @@
                                  missingMessage="An idle timeout warn time in ms must be supplied"/>
                       </div>
                   </div>
-                  <div style="clear:both">
+                  <div class="clear">
                       <div class="formLabel-labelCell tableContainer-labelCell">Idle Timeout Close:</div>
                       <div class="tableContainer-valueCell formLabel-controlCell">
                           <input data-dojo-type="dijit/form/NumberSpinner"
@@ -64,7 +64,7 @@
                                  missingMessage="An idle timeout close time in ms must be supplied"/>
                       </div>
                   </div>
-                  <div style="clear:both">
+                  <div class="clear">
                       <div class="formLabel-labelCell tableContainer-labelCell">Open Timeout Warn:</div>
                       <div class="tableContainer-valueCell formLabel-controlCell">
                           <input data-dojo-type="dijit/form/NumberSpinner"
@@ -76,7 +76,7 @@
                                  missingMessage="An open timeout warn time in ms must be supplied"/>
                       </div>
                   </div>
-                  <div style="clear:both">
+                  <div class="clear">
                       <div class="formLabel-labelCell tableContainer-labelCell">Open Timeout Close:</div>
                       <div class="tableContainer-valueCell formLabel-controlCell">
                           <input data-dojo-type="dijit/form/NumberSpinner"
@@ -91,10 +91,10 @@
               </fieldset>
           </div>
 
-          <div class="formBox" style="clear:both">
+          <div class="clear formBox">
               <fieldset>
                   <legend>House keeping settings</legend>
-                  <div style="clear:both">
+                  <div class="clear">
                       <div class="formLabel-labelCell tableContainer-labelCell">Check period (ms):</div>
                       <div class="tableContainer-valueCell formLabel-controlCell">
                           <input data-dojo-type="dijit/form/NumberSpinner"
@@ -106,7 +106,7 @@
                                   missingMessage="A house keeping check period must be supplied"/>
                       </div>
                   </div>
-                  <div style="clear:both">
+                  <div class="clear">
                       <div class="formLabel-labelCell tableContainer-labelCell">Thread count:</div>
                       <div class="tableContainer-valueCell formLabel-controlCell">
                           <input data-dojo-type="dijit/form/NumberSpinner"
@@ -120,9 +120,9 @@
                   </div>
               </fieldset>
           </div>
-          <div style="clear:both"></div>
+          <div class="clear"></div>
 
-          <div style="clear:both">
+          <div class="clear">
               <div class="formLabel-labelCell tableContainer-labelCell">Dead letter queue enabled:</div>
               <div class="tableContainer-valueCell formLabel-controlCell">
                   <input type="checkbox" id="editVirtualHost.queue.deadLetterQueueEnabled"
@@ -131,7 +131,7 @@
                   </input>
               </div>
           </div>
-          <div style="clear:both"></div>
+          <div class="clear"></div>
 
           <div class="dijitDialogPaneActionBar">
               <button data-dojo-type="dijit/form/Button" id="editVirtualHost.saveButton" data-dojo-props="label: 'Save'">Save</button>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
index 49f069c06d..4caf718f20 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
@@ -20,7 +20,7 @@
   <div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit Virtual Host'" id="editVirtualHostNodeDialog">
       <form id="editVirtualHostNodeForm" method="post" data-dojo-type="dijit/form/Form">
           <div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host Node restart.</div>
-          <div style="clear:both">
+          <div class="clear">
               <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
               <div class="formLabel-controlCell tableContainer-valueCell">
                   <input type="text" id="editVirtualHostNode.name"
@@ -37,7 +37,7 @@
 
           <div id="editVirtualHostNode.typeFields"></div>
 
-          <div style="clear:both"></div>
+          <div class="clear"></div>
 
           <div class="dijitDialogPaneActionBar">
               <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.saveButton" data-dojo-props="label: 'Save'">Save</button>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
index b207258510..ee67e4ce21 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
@@ -85,7 +85,7 @@
     <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
         <div id="header" class="header" style="float: left; width: 300px"></div>
         <div style="float: right;">
-          <div id="login" style="display:none"><span id="authenticatedUser" style="display:none"></span>
+          <div id="login" class="hidden"><span id="authenticatedUser" class="hidden"></span>
             <div id="authenticatedUserControls" data-dojo-type="dijit.form.DropDownButton" data-dojo-props="iconClass: 'preferencesIcon', style:{'max-width': '100px'}">
             <div data-dojo-type="dijit.Menu">
                 <div data-dojo-type="dijit.MenuItem" data-dojo-props="onClick: function(){window.location='logout';}" >Log out</div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
index 8aec8042bd..80116d3141 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
@@ -171,9 +171,9 @@ define(["dojo/_base/xhr",
 
                                   that.updateHeader();
                                   that.bindingsGrid = new UpdatableStore(that.exchangeData.bindings, findNode("bindings"),
-                                                           [ { name: "Queue",    field: "queue",      width: "90px"},
-                                                             { name: "Binding Key", field: "name",          width: "120px"},
-                                                             { name: "Arguments",   field: "argumentString",     width: "100%"}
+                                                           [ { name: "Queue",    field: "queue",      width: "40%"},
+                                                             { name: "Binding Key", field: "name",          width: "30%"},
+                                                             { name: "Arguments",   field: "argumentString",     width: "30%"}
                                                            ], null, {
                                                                keepSelection: true,
                                                                plugins: {
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
index 25c0740730..025390b9ff 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
@@ -95,10 +95,10 @@ define(["dojo/_base/xhr",
                                 autoHeight: 10,
                                 keepSelection: true,
                                 structure: [
-                                    {name:"Size", field:"size", width: "60px"},
-                                    {name:"State", field:"state", width: "120px"},
+                                    {name:"Size", field:"size", width: "40%"},
+                                    {name:"State", field:"state", width: "30%"},
 
-                                    {name:"Arrival", field:"arrivalTime", width: "100%",
+                                    {name:"Arrival", field:"arrivalTime", width: "30%",
                                         formatter: function(val) {
                                             return UserPreferences.formatDateTime(val, {addOffset: true, appendTimeZone: true});
                                         } }
@@ -347,18 +347,18 @@ define(["dojo/_base/xhr",
 
                                    that.updateHeader();
                                    that.bindingsGrid = new UpdatableStore(that.queueData.bindings, findNode("bindings"),
-                                                            [ { name: "Exchange",    field: "exchange",      width: "90px"},
-                                                              { name: "Binding Key", field: "name",          width: "120px"},
-                                                              { name: "Arguments",   field: "argumentString",     width: "100%"}
+                                                            [ { name: "Exchange",    field: "exchange",      width: "40%"},
+                                                              { name: "Binding Key", field: "name",          width: "30%"},
+                                                              { name: "Arguments",   field: "argumentString",     width: "30%"}
                                                             ]);
 
                                    that.consumersGrid = new UpdatableStore(that.queueData.consumers, findNode("consumers"),
-                                                            [ { name: "Name",    field: "name",      width: "70px"},
-                                                              { name: "Mode", field: "distributionMode", width: "70px"},
+                                                            [ { name: "Name",    field: "name",      width: "40%"},
+                                                              { name: "Mode", field: "distributionMode", width: "20%"},
                                                               { name: "Msgs Rate", field: "msgRate",
-                                                              width: "150px"},
+                                                              width: "20%"},
                                                               { name: "Bytes Rate", field: "bytesRate",
-                                                                 width: "100%"}
+                                                                 width: "20%"}
                                                             ]);
 
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
index 9cc0d1f1b2..12ac5602ad 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
@@ -218,11 +218,11 @@ define(["dojo/_base/xhr",
 
                    that.updateHeader();
                    that.queuesGrid = new UpdatableStore(that.vhostData.queues, findNode("queues"),
-                                                        [ { name: "Name",    field: "name",      width: "90px"},
-                                                          { name: "Type",    field: "type",      width: "90px"},
-                                                          { name: "Consumers", field: "consumerCount", width: "90px"},
-                                                          { name: "Depth (msgs)", field: "queueDepthMessages", width: "90px"},
-                                                          { name: "Depth (bytes)", field: "queueDepthBytes", width: "100%",
+                                                        [ { name: "Name",    field: "name",      width: "20%"},
+                                                          { name: "Type",    field: "type",      width: "20%"},
+                                                          { name: "Consumers", field: "consumerCount", width: "20%"},
+                                                          { name: "Depth (msgs)", field: "queueDepthMessages", width: "20%"},
+                                                          { name: "Depth (bytes)", field: "queueDepthBytes", width: "20%",
                                                             get: function(rowIndex, item)
                                                              {
                                                                if(!item){
@@ -248,9 +248,9 @@ define(["dojo/_base/xhr",
 
                    that.exchangesGrid = new UpdatableStore(that.vhostData.exchanges, findNode("exchanges"),
                                                            [
-                                                             { name: "Name",    field: "name", width: "120px"},
-                                                             { name: "Type", field: "type", width: "120px"},
-                                                             { name: "Binding Count", field: "bindingCount", width: "100%"}
+                                                             { name: "Name",    field: "name", width: "40%"},
+                                                             { name: "Type", field: "type", width: "30%"},
+                                                             { name: "Binding Count", field: "bindingCount", width: "30%"}
                                                            ],
                                                            function(obj)
                                                            {
@@ -266,19 +266,19 @@ define(["dojo/_base/xhr",
 
                    that.connectionsGrid = new UpdatableStore(that.vhostData.connections,
                                                              findNode("connections"),
-                                                             [ { name: "Name",    field: "name",      width: "150px"},
-                                                                 { name: "User", field: "principal", width: "120px"},
-                                                                 { name: "Port",    field: "port",      width: "70px"},
-                                                                 { name: "Transport",    field: "transport",      width: "70px"},
-                                                                 { name: "Sessions", field: "sessionCount", width: "70px"},
+                                                             [ { name: "Name",    field: "name",      width: "20%"},
+                                                                 { name: "User", field: "principal", width: "10%"},
+                                                                 { name: "Port",    field: "port",      width: "10%"},
+                                                                 { name: "Transport",    field: "transport",      width: "10%"},
+                                                                 { name: "Sessions", field: "sessionCount", width: "10%"},
                                                                  { name: "Msgs In", field: "msgInRate",
-                                                                     width: "80px"},
+                                                                     width: "10%"},
                                                                  { name: "Bytes In", field: "bytesInRate",
-                                                                     width: "80px"},
+                                                                     width: "10%"},
                                                                  { name: "Msgs Out", field: "msgOutRate",
-                                                                     width: "80px"},
+                                                                     width: "10%"},
                                                                  { name: "Bytes Out", field: "bytesOutRate",
-                                                                     width: "100%"}
+                                                                     width: "10%"}
                                                              ],
                                                              function(obj)
                                                              {
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html
index 31cc245cbf..e91120e43b 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html
@@ -20,25 +20,25 @@
  -->
 <div>
     <div>
-        <div style="clear:both">
+        <div class="clear">
            <div class="formLabel-labelCell">Basic Authentication for HTTP enabled:</div>
-           <div class="httpBasicAuthenticationEnabled" style="float:left;"></div><br/>
+           <div class="httpBasicAuthenticationEnabled"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
            <div class="formLabel-labelCell">Basic Authentication for HTTPS enabled:</div>
-           <div class="httpsBasicAuthenticationEnabled" style="float:left;"></div><br/>
+           <div class="httpsBasicAuthenticationEnabled"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
            <div class="formLabel-labelCell">SASL Authentication for HTTP enabled:</div>
-           <div class="httpSaslAuthenticationEnabled" style="float:left;"></div><br/>
+           <div class="httpSaslAuthenticationEnabled"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
            <div class="formLabel-labelCell">SASL Authentication for HTTPS enabled:</div>
-           <div class="httpsSaslAuthenticationEnabled" style="float:left;"></div><br/>
+           <div class="httpsSaslAuthenticationEnabled"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
            <div class="formLabel-labelCell">Session timeout (s):</div>
-           <div class="sessionTimeout" style="float:left;"></div><br/>
+           <div class="sessionTimeout"></div>
         </div>
     </div>
     <br/>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html
index f5b0d7c9b0..f70b126277 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html
@@ -20,9 +20,9 @@
  -->
 <div>
     <div>
-        <div style="clear:both">
+        <div class="clear">
            <div class="formLabel-labelCell">Use Platform MBean Server:</div>
-           <div class="usePlatformMBeanServer" style="float:left;"></div><br/>
+           <div class="usePlatformMBeanServer"></div>
         </div>
     </div>
     <br/>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
index 8abab4cfe2..0dc71cb582 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
@@ -19,19 +19,19 @@
  -
  -->
 <div class="authorizationProvider">
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell">Name:</div>
-        <div class="name" style="float:left;"></div>
+        <div class="name"></div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell">Type:</div>
-        <div class="type" style="float:left;"></div>
+        <div class="type"></div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell">State:</div>
-        <div class="state" style="float:left;"></div>
+        <div class="state"></div>
     </div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <button data-dojo-type="dijit.form.Button" class="editAuthenticationProviderButton">Edit</button>
     <button data-dojo-type="dijit.form.Button" class="deleteAuthenticationProviderButton">Delete</button>
     <br/>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
index ecf456a9f9..08b01e98bc 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
@@ -20,51 +20,51 @@
  -->
 <div class="broker">
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Broker Attributes',  open: false">
-        <div id="brokerAttributes" style="clear:both">
-             <div id="brokerAttribute.name.container" style="clear:both">
+        <div id="brokerAttributes" class="clear">
+             <div id="brokerAttribute.name.container" class="clear">
                 <div class="formLabel-labelCell">Broker name:</div>
-                <div id="brokerAttribute.name" style="float:left;"></div>
+                <div id="brokerAttribute.name"></div>
             </div>
-            <div id="brokerAttribute.operatingSystem.container" style="clear:both">
+            <div id="brokerAttribute.operatingSystem.container" class="clear">
                 <div class="formLabel-labelCell">Operation system:</div>
-                <div id="brokerAttribute.operatingSystem" style="float:left;"></div>
+                <div id="brokerAttribute.operatingSystem"></div>
             </div>
-            <div id="brokerAttribute.platform.container" style="clear:both">
+            <div id="brokerAttribute.platform.container" class="clear">
                 <div class="formLabel-labelCell">Platform:</div>
-                <div id="brokerAttribute.platform" style="float:left;"></div>
+                <div id="brokerAttribute.platform"></div>
             </div>
-            <div id="brokerAttribute.productVersion.container" style="clear:both">
+            <div id="brokerAttribute.productVersion.container" class="clear">
                 <div class="formLabel-labelCell">Broker version:</div>
-                <div id="brokerAttribute.productVersion" style="float:left;"></div>
+                <div id="brokerAttribute.productVersion"></div>
             </div>
-            <div id="brokerAttribute.modelVersion.container" style="clear:both">
+            <div id="brokerAttribute.modelVersion.container" class="clear">
                 <div class="formLabel-labelCell">Broker model version:</div>
-                <div id="brokerAttribute.modelVersion" style="float:left;"></div>
+                <div id="brokerAttribute.modelVersion"></div>
             </div>
-            <div id="brokerAttribute.defaultVirtualHost.container" style="display: none; clear:both; clear:both;">
+            <div id="brokerAttribute.defaultVirtualHost.container" class="hidden clear">
                 <div class="formLabel-labelCell">Default virtual host:</div>
-                <div id="brokerAttribute.defaultVirtualHost" style="float:left;"></div>
+                <div id="brokerAttribute.defaultVirtualHost"></div>
             </div>
-            <div id="brokerAttribute.statisticsReportingPeriod.container" style="display: none; clear:both">
-                <div class="formLabel-labelCell">Statistics reporting period:</div>
-                <div id="brokerAttribute.statisticsReportingPeriod" style="float:left;"></div>
+            <div id="brokerAttribute.statisticsReportingPeriod.container" class="hidden clear">
+                <div class="formLabel-labelCell">Statistics reporting period (ms):</div>
+                <div id="brokerAttribute.statisticsReportingPeriod"></div>
             </div>
-            <div id="brokerAttribute.statisticsReportingResetEnabled.container" style="display: none; clear:both">
+            <div id="brokerAttribute.statisticsReportingResetEnabled.container" class="hidden clear">
                 <div class="formLabel-labelCell">Statistics reporting period enabled:</div>
-                <div id="brokerAttribute.statisticsReportingResetEnabled" style="float:left;"></div>
+                <div id="brokerAttribute.statisticsReportingResetEnabled"></div>
             </div>
-            <div style="clear:both"></div>
+            <div class="clear"></div>
             <br/>
             <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Global Connection Defaults',  open: true">
-                <div id="brokerAttribute.connection.sessionCountLimit.container" style="clear:both">
+                <div id="brokerAttribute.connection.sessionCountLimit.container" class="clear">
                     <div class="formLabel-labelCell">Maximum number of sessions:</div>
-                    <div id="brokerAttribute.connection.sessionCountLimit" style="float:left;"></div>
+                    <div id="brokerAttribute.connection.sessionCountLimit"></div>
                 </div>
-                <div id="brokerAttribute.connection.heartBeatDelay.container" style="clear:both">
-                    <div class="formLabel-labelCell">Heart beat delay:</div>
-                    <div id="brokerAttribute.connection.heartBeatDelay" style="float:left;"></div> ms
+                <div id="brokerAttribute.connection.heartBeatDelay.container" class="clear">
+                    <div class="formLabel-labelCell">Heart beat delay (ms):</div>
+                    <div id="brokerAttribute.connection.heartBeatDelay"></div>
                 </div>
-                <div style="clear:both"></div>
+                <div class="clear"></div>
             </div>
         </div>
         <br/>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
index 856ac9a75f..1ac09ff8f1 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
@@ -21,27 +21,27 @@
 <div class="connection">
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Connection Attributes',  open: true">
         <div class="alignLeft">
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">Name:</div>
-                <div class="name" style="float:left;"></div>
+                <div class="name formValue-valueCell"></div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">User:</div>
-                <div class="principal" style="float:left;"></div>
-            </div>
-            <div style="clear:both">
+                <div class="principal formValue-valueCell"></div>
+        </div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Client ID:</div>
-                <div class="clientId" style="float:left;"></div>
+                <div class="clientId formValue-valueCell"></div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">Client Version:</div>
-                <div class="clientVersion" style="float:left;"></div>
+                <div class="clientVersion formValue-valueCell"></div>
             </div>
         </div>
         <div class="alignRight">
             <div>
                 <div class="formLabel-labelCell">Inbound:</div>
-                <div class="alignRight">
+                <div class="formValue-valueCell">
                     <span class="msgInRate"></span>
                     <span> msg/s</span>
                     <span class="bytesInRate"></span>
@@ -50,7 +50,7 @@
             </div>
             <div>
                 <div class="formLabel-labelCell">Outbound:</div>
-                <div class="alignRight">
+                <div class="formValue-valueCell">
                     <span class="msgOutRate"></span>
                     <span> msg/s</span>
                     <span class="bytesOutRate"></span>
@@ -59,32 +59,32 @@
             </div>
             <div>
                 <div class="formLabel-labelCell">Connect Time:</div>
-                <div class="alignRight">
+                <div class="formValue-valueCell">
                     <div class="createdTime"></div>
                 </div>
             </div>
             <div>
                 <div class="formLabel-labelCell">Last I/O Time:</div>
-                <div class="alignRight">
+                <div class="formValue-valueCell">
                     <div class="lastIoTime"></div>
                 </div>
             </div>
         </div>
-        <div style="clear:both"></div>
-        <div style="clear:both">
+        <div class="clear"></div>
+        <div class="clear">
             <div class="formLabel-labelCell">Remote Process (PID):</div>
             <div class="remoteProcessPid"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Port:</div>
             <div class="port"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Transport:</div>
             <div class="transport"></div>
         </div>
     </div>
-    <div style="clear:both"/>
+    <div class="clear"/>
 
     <br/>
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
index 1b6518d55e..0f9f75817f 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
@@ -20,41 +20,41 @@
  -->
 <div class="exchange">
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Exchange Attributes',  open: true">
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Name:</div>
-            <div class="name" style="float:left;"></div>
+            <div class="name"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">State:</div>
-            <div class="state" style="float:left;"></div>
+            <div class="state"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Durable:</div>
-            <div class="durable" style="float:left;"></div>
+            <div class="durable"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Lifespan:</div>
-            <div class="lifetimePolicy" style="float:left;"></div>
+            <div class="lifetimePolicy"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Inbound:</div>
-            <div style="float:left;">
+            <div>
                 <span class="msgInRate"></span>
                 <span> msg/s</span>
                 <span class="bytesInRate">(</span>
                 <span class="bytesInRateUnits">)</span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Dropped:</div>
-            <div style="float:left;">
+            <div>
                 <span class="msgDropRate"></span>
                 <span> msg/s</span>
                 <span class="bytesDropRate">(</span>
                 <span class="bytesDropRateUnits">)</span>
             </div>
         </div>
-        <div style="clear:both"></div>
+        <div class="clear"></div>
     </div>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'">
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
index 48e811af0f..f5e116b294 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
@@ -22,20 +22,20 @@
     <div class="keyStoreContainer">
 
        <div class="formLabel-labelCell">Name:</div>
-       <div class="nameValue" style="float:left;"></div><br/>
+       <div class="nameValue"></div>
 
        <div class="formLabel-labelCell">Type:</div>
-       <div class="keyStoreTypeValue" style="float:left;"></div><br/>
+       <div class="keyStoreTypeValue"></div>
 
        <div class="formLabel-labelCell">Key Manager Factory Algorithm:</div>
-       <div class="keyManagerFactoryAlgorithmValue" style="float:left;"></div><br/>
+       <div class="keyManagerFactoryAlgorithmValue"></div>
 
        <div class="formLabel-labelCell">Path:</div>
-       <div class="pathValue" style="float:left;"></div><br/>
+       <div class="pathValue"></div>
 
        <div class="certificateAlias">
           <div class="formLabel-labelCell">Certificate alias:</div>
-          <div class="certificateAliasValue" style="float:left;"></div><br>
+          <div class="certificateAliasValue"></div>
        </div>
 
     </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html
index 633b15b542..72f0f22a0d 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html
@@ -22,11 +22,11 @@
     <div>
         <div style="both:clear">
            <div class="formLabel-labelCell">Name:</div>
-           <div class="name" style="float:left;"></div><br/>
+           <div class="name"></div>
         </div>
         <div style="both:clear">
            <div class="formLabel-labelCell">Type:</div>
-           <div class="type" style="float:left;"></div><br/>
+           <div class="type"></div>
         </div>
     </div>
     <div class="pluginDetails"></div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
index 10c1e220f0..62265a7248 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
@@ -21,59 +21,59 @@
 <div>
     <div class="portContainer">
 
-       <div class="name" style="clear:both">
+       <div class="clear name">
            <div class="formLabel-labelCell">Name:</div>
-           <div class="nameValue" style="float:left;"></div><br/>
+           <div class="nameValue"></div>
        </div>
 
-       <div class="state" style="clear:both">
+       <div class="clear state">
            <div class="formLabel-labelCell">State:</div>
-           <div class="stateValue" style="float:left;"></div><br/>
+           <div class="stateValue"></div>
        </div>
 
-       <div class="port" style="clear:both">
+       <div class="clear port">
            <div class="formLabel-labelCell">Port Number:</div>
-           <div class="portValue" style="float:left;"></div><br/>
+           <div class="portValue"></div>
        </div>
 
-       <div class="authenticationProvider" style="clear:both">
+       <div class="clear authenticationProvider">
            <div class="formLabel-labelCell">Authentication Provider:</div>
-           <div class="authenticationProviderValue" style="float:left;"></div><br/>
+           <div class="authenticationProviderValue"></div>
        </div>
 
-       <div class="protocols" style="clear:both">
+       <div class="clear protocols">
            <div class="formLabel-labelCell">Protocols:</div>
-           <div class="protocolsValue" style="float:left;"></div><br/>
+           <div class="protocolsValue"></div>
        </div>
 
-       <div class="transports" style="clear:both">
+       <div class="clear transports">
            <div class="formLabel-labelCell">Transports:</div>
-           <div class="transportsValue" style="float:left;"></div><br/>
+           <div class="transportsValue"></div>
        </div>
 
-       <div class="bindingAddress" style="clear:both">
+       <div class="clear bindingAddress">
           <div class="formLabel-labelCell">Binding address:</div>
-          <div class="bindingAddressValue" style="float:left;"></div><br>
+          <div class="bindingAddressValue"></div>
        </div>
 
-       <div class="keyStore" style="clear:both">
+       <div class="clear keyStore">
           <div class="formLabel-labelCell">Key Store:</div>
-          <div class="keyStoreValue" style="float:left;"></div><br>
+          <div class="keyStoreValue"></div>
        </div>
 
-       <div class="needClientAuth" style="clear:both">
+       <div class="clear needClientAuth">
           <div class="formLabel-labelCell">Need SSL Client Certificate:</div>
-          <div class="needClientAuthValue" style="float:left;"></div><br>
+          <div class="needClientAuthValue"></div>
        </div>
 
-       <div class="wantClientAuth" style="clear:both">
+       <div class="clear wantClientAuth">
           <div class="formLabel-labelCell">Want SSL Client Certificate:</div>
-          <div class="wantClientAuthValue" style="float:left;"></div><br>
+          <div class="wantClientAuthValue"></div>
        </div>
 
-       <div class="trustStores" style="clear:both">
+       <div class="clear trustStores">
           <div class="formLabel-labelCell">Trust Stores:</div>
-          <div class="trustStoresValue" style="float:left;"></div><br>
+          <div class="trustStoresValue"></div>
        </div>
 
     </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
index 65ad711388..4acb12b43a 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
@@ -20,17 +20,17 @@
  -->
  <div class="preferencesProvider">
   <div class="preferencesProviderAttributes">
-     <div style="clear:both">
+     <div class="clear">
         <div class="formLabel-labelCell">Type:</div>
-        <div class="preferencesProviderType" style="float:left;"></div>
+        <div class="preferencesProviderType"></div>
      </div>
-     <div style="clear:both">
+     <div class="clear">
         <div class="formLabel-labelCell">Name:</div>
-        <div class="preferencesProviderName" style="float:left;"></div>
+        <div class="preferencesProviderName"></div>
      </div>
-     <div style="clear:both">
+     <div class="clear">
         <div class="formLabel-labelCell">State:</div>
-        <div class="preferencesProviderState" style="float:left;"></div>
+        <div class="preferencesProviderState"></div>
      </div>
      <div class="preferencesDetails"></div>
   </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
index 5e6c59eafb..52903a80ea 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
@@ -20,100 +20,100 @@
  -->
 <div class="queue">
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Queue Attributes',  open: true">
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Name:</div>
-            <div class="name" style="float:left;"></div>
+            <div class="name"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">State:</div>
-            <div class="state" style="float:left;"></div>
+            <div class="state"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Durable:</div>
-            <div class="durable" style="float:left;"></div>
+            <div class="durable"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Persist Messages:</div>
-            <div class="messageDurability" style="float:left;"></div>
+            <div class="messageDurability"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Enforced Max. Ttl(ms):</div>
-            <div class="maximumMessageTtl" style="float:left;"></div>
+            <div class="maximumMessageTtl"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Enforced Min. Ttl(ms):</div>
-            <div class="minimumMessageTtl" style="float:left;"></div>
+            <div class="minimumMessageTtl"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Exclusive:</div>
-            <div class="exclusive" style="float:left;"></div>
+            <div class="exclusive"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Owner:</div>
-            <div class="owner" style="float:left;"></div>
+            <div class="owner"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Lifespan:</div>
-            <div class="lifetimePolicy" style="float:left;"></div>
+            <div class="lifetimePolicy"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Type:</div>
-            <div style="float:left;">
+            <div>
                 <span class="type"></span>
                 <span class="typeQualifier"></span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Size:</div>
-            <div style="float:left;">
+            <div>
                 <span class="queueDepthMessages"></span>
                 <span> msgs</span>
                 <span class="queueDepthBytes">(</span>
                 <span class="queueDepthBytesUnits">)</span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Pre-fetched:</div>
-            <div style="float:left;">
+            <div>
                 <span class="unacknowledgedMessages"></span>
                 <span> msgs</span>
                 <span class="unacknowledgedBytes">(</span>
                 <span class="unacknowledgedBytesUnits">)</span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Inbound:</div>
-            <div style="float:left;">
+            <div>
                 <span class="msgInRate"></span>
                 <span> msg/s</span>
                 <span class="bytesInRate">(</span>
                 <span class="bytesInRateUnits">)</span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Outbound:</div>
-            <div style="float:left;">
+            <div>
                 <span class="msgOutRate"></span>
                 <span> msg/s</span>
                 <span class="bytesOutRate">(</span>
                 <span class="bytesOutRateUnits">)</span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">AlternateExchange:</div>
-            <div class="alternateExchange" style="float:left;"></div>
+            <div class="alternateExchange"></div>
         </div>
-        <div class="messageGroups" style="clear:both">
-          <div style="clear:both">
+        <div class="clear messageGroups">
+          <div class="clear">
             <div class="messageGroupKeyLabel formLabel-labelCell ">Message Group Key:</div>
-            <div style="float:left;" class="messageGroupKey"></div>
+            <div class="messageGroupKey"></div>
           </div>
-          <div style="clear:both">
+          <div class="clear">
             <div class="messageGroupSharedGroupsLabel formLabel-labelCell">Shared Message Groups:</div>
-            <div style="float:left;" class="messageGroupSharedGroups"></div>
+            <div class="messageGroupSharedGroups"></div>
           </div>
         </div>
-        <div style="clear:both"></div>
+        <div class="clear"></div>
     </div>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'">
@@ -134,42 +134,42 @@
     </div>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Alerting Thresholds', open: false">
-      <div style="clear:both">
+      <div class="clear">
             <div class="formLabel-labelCell">Queue Depth:</div>
-            <div style="float:left;">
+            <div>
                 <span class="alertThresholdQueueDepthMessages"></span>
                 <span>msgs</span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Queue Depth:</div>
-            <div style="float:left;">
+            <div>
                 <span class="alertThresholdQueueDepthBytes"></span>
                 <span class="alertThresholdQueueDepthBytesUnits"></span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Message Age:</div>
-            <div style="float:left;">
+            <div>
                 <span class="alertThresholdMessageAge"></span>
                 <span class="alertThresholdMessageAgeUnits"></span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Message Size:</div>
-            <div style="float:left;">
+            <div>
                 <span class="alertThresholdMessageSize"></span>
                 <span class="alertThresholdMessageSizeUnits"></span>
             </div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Alert frequency:</div>
-            <div style="float:left;">
+            <div>
                 <span class="alertRepeatGap"></span>
                 <span class="alertRepeatGapUnits"></span>
             </div>
         </div>
-        <div style="clear:both"></div>
+        <div class="clear"></div>
     </div>
 
     <div class="dijitDialogPaneActionBar">
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
index 264170ebfb..eb0e385aa3 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
@@ -22,20 +22,20 @@
     <div class="trustStoreContainer">
 
        <div class="formLabel-labelCell">Name:</div>
-       <div class="nameValue" style="float:left;"></div><br/>
+       <div class="nameValue"></div><br/>
 
        <div class="formLabel-labelCell">Type:</div>
-       <div class="trustStoreTypeValue" style="float:left;"></div><br/>
+       <div class="trustStoreTypeValue"></div><br/>
 
        <div class="formLabel-labelCell">Trust Manager Factory Algorithm:</div>
-       <div class="trustManagerFactoryAlgorithmValue" style="float:left;"></div><br/>
+       <div class="trustManagerFactoryAlgorithmValue"></div><br/>
 
        <div class="formLabel-labelCell">Path:</div>
-       <div class="pathValue" style="float:left;"></div><br/>
+       <div class="pathValue"></div><br/>
 
        <div class="peersOnly">
           <div class="formLabel-labelCell">Peer store:</div>
-          <div class="peersOnlyValue" style="float:left;"></div>
+          <div class="peersOnlyValue"></div>
        </div>
 
     </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
index ed9d0acc60..9dd6330d01 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
@@ -23,19 +23,19 @@
 <div class="virtualhost">
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host Attributes',  open: true">
         <div class="alignLeft">
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">Name:</div>
-                <div class="name" style="float:left;"></div>
+                <div class="name formValue-valueCell"></div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">Type:</div>
-                <div class="type" style="float:left;"></div>
+                <div class="type formValue-valueCell"></div>
             </div>
         </div>
         <div class="alignRight">
             <div>
                 <div class="formLabel-labelCell">Inbound:</div>
-                <div class="alignRight">
+                <div class="formValue-valueCell">
                     <span class="msgInRate"></span>
                     <span> msg/s</span>
                     <span class="bytesInRate"></span>
@@ -44,7 +44,7 @@
             </div>
             <div>
                 <div class="formLabel-labelCell">Outbound:</div>
-                <div class="alignRight">
+                <div class="formValue-valueCell">
                     <span class="msgOutRate"></span>
                     <span> msg/s</span>
                     <span class="bytesOutRate"></span>
@@ -52,60 +52,60 @@
                 </div>
             </div>
         </div>
-        <div style="clear:both"></div>
-        <div style="clear:both">
+        <div class="clear"></div>
+        <div class="clear">
             <div class="formLabel-labelCell">State:</div>
-            <div class="state" style="float:left;"></div>
+            <div class="state"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Durable:</div>
-            <div class="durable" style="float:left;"></div>
+            <div class="durable"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Lifespan:</div>
-            <div class="lifetimePolicy" style="float:left;"></div>
+            <div class="lifetimePolicy"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Dead letter queue enabled:</div>
-            <div class="deadLetterQueueEnabled" style="float:left;"></div>
+            <div class="deadLetterQueueEnabled"></div>
         </div>
-        <div style="clear:both" class="virtualHostDetailsContainer"></div>
-        <div style="clear:both"></div>
+        <div class="clear virtualHostDetailsContainer"></div>
+        <div class="clear"></div>
 
         <br/>
 
         <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Store Transaction Settings',  open: false">
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">Idle timeout before a warning (ms) :</div>
-                <div class="storeTransactionIdleTimeoutWarn" style="float:left;"></div>
+                <div class="storeTransactionIdleTimeoutWarn"></div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">Idle timeout before closing (ms) :</div>
-                <div class="storeTransactionIdleTimeoutClose" style="float:left;"></div>
+                <div class="storeTransactionIdleTimeoutClose"></div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell" >Open timeout before warning (ms) :</div>
-                <div class="storeTransactionOpenTimeoutWarn" style="float:left;"></div>
+                <div class="storeTransactionOpenTimeoutWarn"></div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">Open timeout before closing (ms) :</div>
-                <div class="storeTransactionOpenTimeoutClose" style="float:left;"></div>
+                <div class="storeTransactionOpenTimeoutClose"></div>
             </div>
-            <div style="clear:both"></div>
+            <div class="clear"></div>
         </div>
 
         <br/>
 
         <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'House Keeping Settings',  open: false">
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">House keeping check period (ms):</div>
-                <div class="housekeepingCheckPeriod" style="float:left;"></div>
+                <div class="housekeepingCheckPeriod"></div>
             </div>
-            <div style="clear:both">
+            <div class="clear">
                 <div class="formLabel-labelCell">House keeping thread count:</div>
-                <div class="housekeepingThreadCount" style="float:left;"></div>
+                <div class="housekeepingThreadCount"></div>
             </div>
-            <div style="clear:both"></div>
+            <div class="clear"></div>
         </div>
 
     </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html
index 9957f3ede4..4c32a9ace7 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html
@@ -22,21 +22,21 @@
 
 <div class="virtualhostnode">
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host Node Attributes',  open: true">
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Name:</div>
-            <div class="name" style="float:left;"></div>
+            <div class="name"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">Type:</div>
-            <div class="type" style="float:left;"></div>
+            <div class="type"></div>
         </div>
-        <div style="clear:both">
+        <div class="clear">
             <div class="formLabel-labelCell">State:</div>
-            <div class="state" style="float:left;"></div>
+            <div class="state"></div>
         </div>
-        <div class="virtualhostnodedetails" style="clear:both">
+        <div class="clear virtualhostnodedetails">
         </div>
-        <div style="clear:both"></div>
+        <div class="clear"></div>
     </div>
     <div class="dijitDialogPaneActionBar">
       <button data-dojo-type="dijit.form.Button" class="startNodeButton" type="button" data-dojo-props="disabled: true">Start</button>
@@ -45,7 +45,7 @@
       <button data-dojo-type="dijit.form.Button" class="deleteNodeButton" data-dojo-props="iconClass: 'dijitIconDelete'">Delete</button>
     </div>
     <br/>
-    <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host'" class="virtualHostGridPanel" style="clear:both">
+    <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host'" class="clear virtualHostGridPanel">
         <div class="virtualHost"></div>
     </div>
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
index dee80f857b..de0c2aaa21 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
@@ -19,7 +19,7 @@
 
 <div>
   <div id="addVirtualHost.diskFlowControls">
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="addVirtualHost.storeOverfullSize"
@@ -32,7 +32,7 @@
                               constraints:{min:0,places:0}" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Store underfull size:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="addVirtualHost.storeUnderfullSize"
@@ -46,6 +46,6 @@
         </div>
     </div>
    </div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <div class="infoMessage">The virtual host will have the same name as the node.</div>
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html
index 3d2dc3cc9c..e889149e99 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html
@@ -18,13 +18,13 @@
   -->
 
 <div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell">Store overfull size:</div>
         <div ><span class="storeOverfullSize" ></span> bytes</div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell">Store underfull size:</div>
         <div><span class="storeUnderfullSize" ></span> bytes</div>
     </div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
index e8f523b320..522d2b3abf 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
@@ -18,7 +18,7 @@
   -->
 
 <div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Message store path*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="addVirtualHost.storePath"
@@ -31,7 +31,7 @@
                               title: 'Enter message store path'" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="addVirtualHost.storeOverfullSize"
@@ -44,7 +44,7 @@
                               constraints:{min:0,places:0}" />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Store underfull size:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="addVirtualHost.storeUnderfullSize"
@@ -57,6 +57,6 @@
                               constraints:{min:0,places:0}" />
         </div>
     </div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <div class="infoMessage">The virtual host will have the same name as the node.</div>
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html
index 088057533b..937f036445 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html
@@ -19,7 +19,7 @@
 
 <div>
 
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Message store path*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="editVirtualHost.storePath"
@@ -34,7 +34,7 @@
         </div>
     </div>
 
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size (bytes):</div>
         <div class="tableContainer-valueCell formLabel-controlCell">
             <input data-dojo-type="dijit/form/NumberSpinner"
@@ -48,7 +48,7 @@
                    />
         </div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Store underfull size (bytes):</div>
         <div class="tableContainer-valueCell formLabel-controlCell">
             <input data-dojo-type="dijit/form/NumberSpinner"
@@ -63,6 +63,6 @@
         </div>
     </div>
 
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html
index 350a9777cb..1f3c1e820c 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html
@@ -18,17 +18,17 @@
   -->
 
 <div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell">Message store path:</div>
         <div class="storePath"></div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell">Store overfull size:</div>
         <div><span class="storeOverfullSize"></span> bytes</div>
     </div>
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell">Store underfull size:</div>
         <div><span class="storeUnderfullSize"></span> bytes</div>
     </div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html
index 7c5c07e4a8..a132444268 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html
@@ -19,7 +19,7 @@
 
 <div>
 
-    <div style="clear:both">
+    <div class="clear">
         <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="editVirtualHostNode.storePath"
@@ -33,6 +33,6 @@
         </div>
     </div>
 
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
index 0d8556f192..622eb17b63 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
@@ -19,7 +19,7 @@
  -
  -->
 <div>
-    <div style="clear:both">
+    <div class="clear">
       <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.jsonStorePath"
@@ -32,5 +32,5 @@
                               title: 'Enter store path'" />
       </div>
     </div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html
index b8c6adeed3..48aec9c342 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 
-<div style="clear:both">
+<div class="clear">
   <div class="formLabel-labelCell">Configuration store path:</div>
   <div class="storePath"></div>
 </div>
diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
index 56577083e0..7b9172257b 100644
--- a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
@@ -17,6 +17,6 @@
   ~ under the License.
   -->
 <div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
     <div class="infoMessage">The virtual host will have the same name as the node.</div>
 </div>
diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
index 9a3bc91e77..1422d9e366 100644
--- a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
@@ -19,5 +19,5 @@
  -
  -->
 <div>
-    <div style="clear:both"></div>
+    <div class="clear"></div>
 </div>