diff --git a/src/views/partials/admin/page-admin-communities.pug b/src/views/partials/admin/page-admin-communities.pug
index 2193c39..4817d9c 100644
--- a/src/views/partials/admin/page-admin-communities.pug
+++ b/src/views/partials/admin/page-admin-communities.pug
@@ -1,56 +1,58 @@
-.content-box.full-width
-  solid-router(default-route='admin-communities-list', hidden)
-    solid-route(name='admin-communities-list')
-    solid-route(name='admin-users-create', use-id)
+solid-router(default-route='admin-communities-list', hidden)
+  solid-route(name='admin-communities-list')
+  solid-route(name='admin-users-create', use-id)
 
-  solid-widget(name='hubl-action-community')
-    template
-      solid-ac-checker(data-src="${value}", nested-field="members", permission='acl:Append')
-        solid-link(
-          class='button text-small text-bold text-uppercase reversed color-secondary bordered icon icon-plus'
-          data-src="${value}"
-          next="admin-users-create"
-          data-trans='communities.linkInvite'
+solid-widget(name='hubl-action-community')
+  template
+    solid-ac-checker(data-src="${value}", nested-field="members", permission='acl:Append')
+      solid-link(
+        class='button text-small text-bold text-uppercase reversed color-secondary bordered icon icon-plus'
+        data-src="${value}"
+        next="admin-users-create"
+        data-trans='communities.linkInvite'
+      )
+    solid-ac-checker(data-src="${value}", nested-field="members", no-permission='acl:Append')
+      div.button.button-disabled(data-trans='communities.noPermission')
+
+#admin-communities-list(hidden, data-view="admin-communities-list")
+  div.segment.lg-full.padding-large.border-bottom.border-color-grey
+    div
+      h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
+    div.segment.lg-hidden
+      button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='communities.menuMobile')
+
+  div.segment.lg-full.padding-large.whitespace-normal
+
+    div.segment.lg-full.margin-bottom-xlarge
+      h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle')
+
+    .segment.table-wrapper
+      .table
+        div.table-header.bg-color-third.text-color-heading
+          div.segment.table-cell.table-cell.lg-half(data-trans='communities.tableHeader1') 
+          div.segment.table-cell.table-cell.lg-half(data-trans='communities.tableHeader2')
+      
+        solid-display(
+          class='table-body'
+          bind-user
+          nested-field='communities'
+          fields='cell1(community.name), cell2(community)'
+          loader-id='loader-admin-community'
+
+          class-cell1='segment table-cell padding-medium lg-half text-center'
+          class-cell2='segment table-cell padding-medium lg-half text-center'
+
+          class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large'
+          widget-community='hubl-action-community'
+
+          order-asc='community.name'
         )
-      solid-ac-checker(data-src="${value}", nested-field="members", no-permission='acl:Append')
-        div.button.button-disabled(data-trans='communities.noPermission')
 
-  #admin-communities-list.content-box__height(hidden, data-view="admin-communities-list")
-    div.segment.padding-top-xsmall.padding-right-large.padding-bottom-xsmall.padding-left-large.border-bottom.border-color-grey.text-color-heading
+    div#loader-admin-community.loader.loader-top
+      div
+      div
+      div
       div
-        h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
-      div.segment.lg-hidden
-        button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='communities.menuMobile')
-  
-    div.segment.padding-large.clearfix
-      div.segment.margin-bottom-medium.float-left
-        h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle')
 
-      .table-wrapper
-        .table
-          div.table-header.bg-color-third.text-color-heading
-            div.table-cell.w450(data-trans='communities.tableHeader1') 
-            div.table-cell.w370(data-trans='communities.tableHeader2')
-        
-          solid-display(
-            class='table-body'
-            bind-user
-            nested-field='communities'
-            fields='community.name, community'
-            loader-id='loader-admin-community'
-
-            class-community.name='table-cell w450 text-xlarge text-color-heading text-semibold text-letter-spacing-large'
-            class-community='table-cell w370'
-            widget-community='hubl-action-community'
-
-            order-asc='community.name'
-          )
-
-      div#loader-admin-community.loader.loader-top
-        div
-        div
-        div
-        div
-
-  #admin-users-create.content-box__height(hidden, data-view="admin-users-create")
-    include page-admin-users-create.pug
+#admin-users-create.content-box__height(hidden, data-view="admin-users-create")
+  include page-admin-users-create.pug
diff --git a/src/views/partials/admin/page-admin-users-create.pug b/src/views/partials/admin/page-admin-users-create.pug
index cec43a4..6b3967a 100644
--- a/src/views/partials/admin/page-admin-users-create.pug
+++ b/src/views/partials/admin/page-admin-users-create.pug
@@ -1,11 +1,11 @@
-div.segment.padding-top-xsmall.padding-right-large.padding-bottom-xsmall.padding-left-large.border-bottom.border-color-grey.text-color-heading.clearfix
-  div.segment.lg-half.float-left
+div.segment.lg-full.padding-large.border-bottom.border-color-grey
+  div.segment.lg-half
     h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
-  div.segment.lg-half.float-left.text-right
+  div.segment.lg-half.text-right
     solid-link(class="backlink", next='admin-communities-list' data-trans='user.create.backlink')
 
 
-div.segment.padding-large.clearfix
+div.segment.lg-full.padding-large.whitespace-normal
   div#loader-users-title.loader.loader
     div
     div
@@ -25,7 +25,7 @@ div.segment.padding-large.clearfix
 
   solid-widget(name='hubl-email-field')
     template
-      div.segment.margin-bottom-medium.lg-half.padding-left-small.text-small.text-semibold.text-uppercase.text-color-heading.float-left
+      div.segment.margin-bottom-medium.lg-half.padding-left-small.text-small.text-semibold.text-uppercase.text-color-heading
         label(data-trans='user.create.labelEmail')
         input(type="email" label='' data-trans='label=user.create.labelEmail' name="email" required value="\${value}" data-holder)
 
@@ -33,7 +33,7 @@ div.segment.padding-large.clearfix
     div.segment.float-left
       h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='user.create.title', loader-id='loader-users-title')
   
-  solid-form.button-register#selected-community(
+  solid-form.form#selected-community(
     bind-resources
     nested-field='members'
 
@@ -44,9 +44,9 @@ div.segment.padding-large.clearfix
     required-user.email
     loader-id='loader-users-create'
 
-    class-user.first_name='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading float-left'
-    class-user.last_name='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading float-left'
-    class-user.username='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading float-left'
+    class-user.first_name='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading'
+    class-user.last_name='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading'
+    class-user.username='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading'
 
     label-user.first_name=''
     label-user.last_name=''