diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js
index f2a41b0c85..093fe0ea98 100644
--- a/src/sunstone/public/app/sunstone.js
+++ b/src/sunstone/public/app/sunstone.js
@@ -304,7 +304,7 @@ define(function(require) {
           buttonContext = $("#" + customId + "refresh_buttons", buttonsRow);
           icon = button.icon ? button.icon : '<i class="fa fa-refresh"/>';
           text = button.text ? icon + ' ' + button.text : icon;
-          strClass.push("white_button", "refresh", "button",  "secondary");
+          strClass.push("refresh", "button",  "secondary");
           buttonCode = '<button class="' + strClass.join(' ') + '" href="' + buttonName + '">' + text + '</button>';
           break;
         case "top":
@@ -313,7 +313,7 @@ define(function(require) {
               '<i class="fa fa-refresh fa-stack-2x" style="color: #dfdfdf"></i>' +
               '<i class="fa fa-play fa-stack-1x"></i>' +
             '</span>';
-          strClass.push("white_button", "toggle_top_button", "only-right-list", "button",  "hollow");
+          strClass.push("toggle_top_button", "only-right-list", "button",  "hollow");
           buttonCode = '<a class="' + strClass.join(' ') + '" style="padding-left:0px; margin-right: 20px">' + text + '</a>';
           break;
         case "main":
diff --git a/src/sunstone/public/app/sunstone/panels.hbs b/src/sunstone/public/app/sunstone/panels.hbs
index a82ea38728..ecbc7d1be6 100644
--- a/src/sunstone/public/app/sunstone/panels.hbs
+++ b/src/sunstone/public/app/sunstone/panels.hbs
@@ -14,7 +14,7 @@
 {{! limitations under the License.                                             }}
 {{! -------------------------------------------------------------------------- }}
 
-<div id="{{containerId}}" class="bordered-tabs">
+<div id="{{containerId}}">
   <ul id="{{containerId}}Tabs" class="tabs right-info-tabs text-center" data-tabs>
     {{#each panels}}
     <li class="tabs-title {{#if active}}is-active{{/if}}">
diff --git a/src/sunstone/public/app/sunstone/tab.hbs b/src/sunstone/public/app/sunstone/tab.hbs
index 9b8dd3409a..2810206d31 100644
--- a/src/sunstone/public/app/sunstone/tab.hbs
+++ b/src/sunstone/public/app/sunstone/tab.hbs
@@ -60,7 +60,7 @@
 
     {{#if subheader}}
     <div class="row header-info">
-      <div class="large-12 columns text-center totals-info">
+      <div class="large-12 columns text-center">
         <h5>
           {{#if subheader}}
             {{{subheader}}}
diff --git a/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs b/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs
index fb339ba3a4..c807e056e6 100644
--- a/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs
+++ b/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs
@@ -14,7 +14,7 @@
 {{! limitations under the License.                                             }}
 {{! -------------------------------------------------------------------------- }}
 
-<div class="totals-info">
+<div>
   <fieldset class="large-font">
     <legend>
       <ul class="menu simple">
diff --git a/src/sunstone/public/app/tabs/dashboard-tab/network.hbs b/src/sunstone/public/app/tabs/dashboard-tab/network.hbs
index 5b5ae58e11..e6a7a989c0 100644
--- a/src/sunstone/public/app/tabs/dashboard-tab/network.hbs
+++ b/src/sunstone/public/app/tabs/dashboard-tab/network.hbs
@@ -13,7 +13,7 @@
 {{! See the License for the specific language governing permissions and        }}
 {{! limitations under the License.                                             }}
 {{! -------------------------------------------------------------------------- }}
-<div class="totals-info">
+<div>
   <fieldset class="large-font">
     <legend>
       <ul class="menu simple">
diff --git a/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs b/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs
index 1589b3e3e2..ce801de0aa 100644
--- a/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs
+++ b/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs
@@ -13,7 +13,7 @@
 {{! See the License for the specific language governing permissions and        }}
 {{! limitations under the License.                                             }}
 {{! -------------------------------------------------------------------------- }}
-<div class="totals-info">
+<div>
   <fieldset class="large-font">
     <legend>
       <ul class="menu simple">
diff --git a/src/sunstone/public/app/tabs/dashboard-tab/users.hbs b/src/sunstone/public/app/tabs/dashboard-tab/users.hbs
index a6ffaa2693..6fce69a3af 100644
--- a/src/sunstone/public/app/tabs/dashboard-tab/users.hbs
+++ b/src/sunstone/public/app/tabs/dashboard-tab/users.hbs
@@ -14,7 +14,7 @@
 {{! limitations under the License.                                             }}
 {{! -------------------------------------------------------------------------- }}
 
-<div class="totals-info">
+<div>
   <fieldset class="large-font">
     <legend>
       <ul class="menu simple">
diff --git a/src/sunstone/public/app/tabs/dashboard-tab/vms.hbs b/src/sunstone/public/app/tabs/dashboard-tab/vms.hbs
index 058117c76f..d875eecedd 100644
--- a/src/sunstone/public/app/tabs/dashboard-tab/vms.hbs
+++ b/src/sunstone/public/app/tabs/dashboard-tab/vms.hbs
@@ -14,7 +14,7 @@
 {{! limitations under the License.                                             }}
 {{! -------------------------------------------------------------------------- }}
 
-<div class="totals-info">
+<div>
   <fieldset class="large-font">
     <legend>
       <ul class="menu simple">
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs
index 4d348c0ed5..7fe2e50081 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs
@@ -105,7 +105,7 @@
   </div>
   <br>
   <div class="row">
-    <div id="new_role" class="bordered-tabs large-12 columns">
+    <div id="new_role" class="large-12 columns">
       <ul class="tabs" id="roles_tabs" data-tabs>
         <a class="button small right radius" id="tf_btn_roles">
           <span class="fa fa-plus"></span>{{tr "Add another role"}}
diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs
index 6f7ca5d27f..6f8ed2143d 100644
--- a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs
+++ b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs
@@ -71,7 +71,7 @@
                     <div class="medium-4 columns">
                       <button href="#"  data-options="align:right" data-dropdown="provisionVMInstantiateLabelsDropdown" class="secondary button dropdown"> <i class="fa fa-tags"/>{{tr "Labels"}}
                       </button>
-                      <ul id="provisionVMInstantiateLabelsDropdown" class="labels-dropdown f-dropdown" data-dropdown-content></ul>
+                      <ul id="provisionVMInstantiateLabelsDropdown" class="labels-dropdown" data-dropdown-content></ul>
                     </div>
                   </div>
                   <div class="medium-6 columns"></div>
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard.hbs
index 927586a555..52fb005d37 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard.hbs
@@ -15,7 +15,7 @@
 {{! -------------------------------------------------------------------------- }}
 
 <form data-abide="ajax" id="{{formPanelId}}Wizard" class="custom creation">
-  <div class="bordered-tabs">
+  <div>
     <dl id="{{formPanelId}}Tabs" class="tabs right-info-tabs" data-tabs>
       {{#each wizardTabs}}
       <dd class='tabs-title {{classes}}'>
diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
index b980554fcb..a8bd2232af 100644
--- a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
@@ -91,7 +91,7 @@
     <textarea rows="6" type="text" id="user_ssh_public_key_textarea" name="ssh_public_key" hidden>
       {{~element.TEMPLATE.SSH_PUBLIC_KEY~}}
     </textarea>
-    <p id="user_ssh_public_key_text" name="ssh_public_key">
+    <p id="user_ssh_public_key_text" class="ellipsis" name="ssh_public_key">
       {{#if element.TEMPLATE.SSH_PUBLIC_KEY}}
         {{element.TEMPLATE.SSH_PUBLIC_KEY}}
       {{else}}
diff --git a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/wizard.hbs b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/wizard.hbs
index 927586a555..52fb005d37 100644
--- a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/wizard.hbs
+++ b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/wizard.hbs
@@ -15,7 +15,7 @@
 {{! -------------------------------------------------------------------------- }}
 
 <form data-abide="ajax" id="{{formPanelId}}Wizard" class="custom creation">
-  <div class="bordered-tabs">
+  <div>
     <dl id="{{formPanelId}}Tabs" class="tabs right-info-tabs" data-tabs>
       {{#each wizardTabs}}
       <dd class='tabs-title {{classes}}'>
diff --git a/src/sunstone/public/scss/_helper-classes.scss b/src/sunstone/public/scss/_helper-classes.scss
new file mode 100644
index 0000000000..df07b7405f
--- /dev/null
+++ b/src/sunstone/public/scss/_helper-classes.scss
@@ -0,0 +1,20 @@
+.open-control:hover {
+    cursor: pointer;
+}
+
+.nowrap {
+  white-space: nowrap;
+}
+
+.ellipsis {
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+}
+/*
+#user_ssh_public_key_text, #config_ssh_public_key_text {
+  overflow-x:hidden;
+  text-overflow: ellipsis;
+}
+*/
+// padding: 0px 10px;
+// height: 120px;
\ No newline at end of file
diff --git a/src/sunstone/public/scss/_settings.scss b/src/sunstone/public/scss/_settings.scss
index 4893f672d6..51761e764b 100644
--- a/src/sunstone/public/scss/_settings.scss
+++ b/src/sunstone/public/scss/_settings.scss
@@ -452,8 +452,8 @@ $pagination-item-color: $black;
 $pagination-item-padding: rem-calc(3 10);
 $pagination-item-spacing: rem-calc(1);
 $pagination-radius: $global-radius;
-$pagination-item-background-hover: $light-gray;
-$pagination-item-background-current: $primary-color;
+$pagination-item-background-hover: $medium-gray;
+$pagination-item-background-current: $light-gray;
 $pagination-item-color-current: foreground($pagination-item-background-current);
 $pagination-item-color-disabled: $medium-gray;
 $pagination-ellipsis-color: $black;
diff --git a/src/sunstone/public/scss/_table.scss b/src/sunstone/public/scss/_table.scss
index ce08ef89e9..b5d6ec7914 100644
--- a/src/sunstone/public/scss/_table.scss
+++ b/src/sunstone/public/scss/_table.scss
@@ -73,4 +73,10 @@ table {
   .refresh-table {
     margin-top: 0.5rem;
   }
-}
\ No newline at end of file
+}
+
+table{
+  .has-tip {
+    display: table-cell;
+  }
+}
diff --git a/src/sunstone/public/scss/_tree.scss b/src/sunstone/public/scss/_tree.scss
new file mode 100644
index 0000000000..8e63c2897d
--- /dev/null
+++ b/src/sunstone/public/scss/_tree.scss
@@ -0,0 +1,52 @@
+
+/* Tree lists */
+
+.tree, .tree ul{
+  font: inherit;
+  list-style-type: none;
+  margin-left: 1em;
+  padding: 0;
+  position: relative;
+}
+
+.tree li{
+  margin: 0;
+  padding: 0 1em;
+  position: relative;
+}
+
+.tree li::before, .tree li::after{
+  content: '';
+  position: absolute;
+  left: 0;
+}
+
+/* horizontal line on inner list items */
+.tree li::before{
+  border-top: 1px solid #999;
+  top: 0.5em;
+  width: 10px;
+  height: 0;
+}
+
+/* vertical line on list items */
+.tree li:after{
+  border-left: 1px solid #999;
+  height: 100%;
+  width: 0px;
+  top: -0.5em;
+}
+
+/* lower line on list items from the first level because they don't have parents */
+.tree > li::after{
+  top: 0.5em;
+}
+
+/* hide line from the last of the first level list items */
+.tree > li:last-child::after{
+  display: none;
+}
+
+.tree ul:last-child li:last-child:after{
+  height:1em;
+}
\ No newline at end of file
diff --git a/src/sunstone/public/scss/app.scss b/src/sunstone/public/scss/app.scss
index 1399bd8e4a..443213b1c6 100644
--- a/src/sunstone/public/scss/app.scss
+++ b/src/sunstone/public/scss/app.scss
@@ -34,6 +34,8 @@
 @import './table';
 @import './tabs';
 @import './vcenter';
+@import './tree';
+@import './helper-classes';
 
 //@font-face {
 //  font-family: 'Open Sans';
@@ -120,18 +122,8 @@ meter {
   margin-bottom: 0;
 }
 
-table{
-  .has-tip {
-    display: table-cell;
-  }
-}
-
-.nowrap {
-  white-space: nowrap;
-}
-
 .disk-resize-icon {
   color: $bold-black;
   font-weight: $global-weight-normal;
+}
 
-}
\ No newline at end of file