diff --git a/src/index.pug b/src/index.pug
index 7fe0bae09cc3c96ff482b868b88dd9819810f813..2160faf6982389b2eecfa4bd6be39d49be0461dd 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -51,7 +51,7 @@ html(lang="en")
         include views/partials/menu-left.pug
 
       main#content.segment.lg-three-quarter.text-top.notLoggedIn
-        #project(hidden, data-view="project", no-render).with-sidebar
+        #project(hidden, data-view="project", no-render).with-sidebar.whitespace-normal
           hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.projects")
           hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${endpoints.get.projects}`)
           hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${endpoints.get.projects}`)
diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug
index 800ba27c0412bc8502de0f02faeb796c347337b9..d109c47185cfb7b45dd78ee71b6fe60acfa5347c 100644
--- a/src/views/partials/project/page-project-edit.pug
+++ b/src/views/partials/project/page-project-edit.pug
@@ -1,6 +1,6 @@
 solid-ac-checker(permission='acl:Read', bind-resources)
-  div.segment.padding-large.border-bottom.border-color-grey.clearfix
-    div.segment.lg-half.float-left
+  div.segment.lg-full.padding-large.border-bottom.border-color-grey
+    div.segment.lg-half
       solid-display.text-xxlarge.text-letter-spacing-large(
         bind-resources
         fields='const-title1, number, customer.name, dash, name'
@@ -14,10 +14,10 @@ solid-ac-checker(permission='acl:Read', bind-resources)
         value-const-title1='N°'
         value-dash=' - '
       )
-    div.segment.lg-half.float-left.text-right
+    div.segment.lg-half.text-right
       solid-link(class='backlink right', bind-resources, next='project-profile' data-trans='project.edit.backlink')
 
-div.segment.padding-large
+div.segment.lg-full.padding-large.whitespace-normal
 
   solid-widget(name="project-edit-members-delete")
     template
@@ -37,7 +37,7 @@ div.segment.padding-large
       div
 
     //- Add translation for description and captain in the translate file
-    solid-form.segment.clearfix.button-register(
+    solid-form.segment.whitespace-normal.button-register(
       bind-resources
     
       fields='customer.name, name, description, captain'
@@ -51,10 +51,10 @@ div.segment.padding-large
       label-description=''
       label-captain=''
 
-      class-customer.name='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading float-left'
-      class-name='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading float-left'
+      class-customer.name='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading'
+      class-name='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading'
       class-description='segment margin-bottom-medium lg-full text-small text-semibold text-uppercase text-color-heading'
-      class-captain='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading icon icon-magnify'
+      class-captain='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading icon icon-magnify whitespace-normal'
 
       widget-description='solid-form-textarea'
       widget-captain='solid-form-dropdown-autocompletion-label'
@@ -67,7 +67,7 @@ div.segment.padding-large
       data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-description=project.edit.labelDescription;submit-button=project.edit.buttonSubmit'
     )
 
-  h3.segment.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle')
+  h3.segment.lg-full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle')
 
   solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
     solid-form.block.segment.margin-bottom-xlarge.clearfix.button-register(
@@ -84,7 +84,7 @@ div.segment.padding-large
       data-trans='submit-button=project.edit.buttonAddMember'
     )
 
-  .table-wrapper
+  //-.table-wrapper
     .table
       div.table-header.bg-color-third.text-color-heading
         div.table-cell.w280(data-trans='project.edit.tableHeader1')