diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss
index 029123aca12cf0a8adc9a6c48b5d104e7811f97f..9ba0e4b9dc80b16c0f6fa38df7178521bcac835b 100644
--- a/src/styles/base/form.scss
+++ b/src/styles/base/form.scss
@@ -48,6 +48,7 @@ solid-form {
     width: unset;
     z-index: unset;
     float: right;
+    margin-top: 10px;
   }
 }
 
diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug
index 4a8b10d634c2d442f763a2576dc076803782d333..d21ce7f083b8a8dfff4f95e9282011508e075776 100644
--- a/src/views/admin/page-admin-circles-create.pug
+++ b/src/views/admin/page-admin-circles-create.pug
@@ -21,8 +21,8 @@ div.segment.padding-xlarge
     loader-id='loader-circles-create'
 
     class-status='block segment lg-half margin-bottom padding-left-large box-border text-small text-bold text-uppercase text-color-heading'
-    class-name='segment lg-half float-left margin-bottom-xlarge padding-left-large box-border text-small text-bold text-uppercase text-color-heading'
-    class-description='segment lg-half float-left margin-bottom-xlarge padding-left-large box-border text-small text-bold text-uppercase text-color-heading'
+    class-name='segment lg-half float-left margin-bottom padding-left-large box-border text-small text-bold text-uppercase text-color-heading'
+    class-description='segment lg-half float-left margin-bottom padding-left-large box-border text-small text-bold text-uppercase text-color-heading'
 
     label-status=''
     label-name=''
diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug
index 44169cee9773c42bd690dcf3065c17d3c271640f..565e4c8043bccbcd8a4c1130056d970e81cf48a4 100644
--- a/src/views/admin/page-admin-projects-create.pug
+++ b/src/views/admin/page-admin-projects-create.pug
@@ -1,8 +1,10 @@
-div.content-box__info.flex
-  solid-link(class="backlink right" next='admin-project-list' data-trans='project.create.backlink')
-
-  h1.centered(data-trans='project.create.title')
+div.segment.padding-xlarge.border-bottom.clearfix
+  div.segment.lg-half.float-left
+    h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title')
+  div.segment.lg-half.float-left.text-right
+    solid-link(class="backlink", next='admin-project-list' data-trans='project.create.backlink')
 
+div.segment.padding-xlarge
   div#loader-projects-create.loader.loader-top
     div
     div
@@ -12,7 +14,7 @@ div.content-box__info.flex
   solid-form.form.button-register(
     data-src=`${endpoints.projects || endpoints.post.projects}`
     
-    fields='status, line-1(customer.name, name), line-2(captain)'
+    fields='status, customer.name, name, captain'
     required-status
     required-customer.name
     required-name
@@ -25,18 +27,16 @@ div.content-box__info.flex
     value-status="Private"
 
 		label-customer.name=''
-    class-customer.name='form-label is-light is-half-width input-text-like'
+    class-customer.name='segment lg-half float-left margin-bottom padding-left-large box-border text-small text-bold text-uppercase text-color-heading'
 
 		label-name=''
-    class-name='form-label is-light is-half-width input-text-like'
+    class-name='segment lg-half float-left margin-bottom-xlarge padding-left-large box-border text-small text-bold text-uppercase text-color-heading'
 
     label-captain=''
     range-captain=`${endpoints.users || endpoints.get.users}`
-    class-captain='form-label is-light is-half-width'
+    class-captain='block segment lg-half margin-bottom padding-left-large box-border text-small text-bold text-uppercase text-color-heading'
     widget-captain='solid-form-dropdown-autocompletion-label'
 
-    class='input-text-like'
-
     next='project'
 
     submit-button=''
diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug
index 102ec7fffb862e23134d53ea2e1b6e9c6fbe81ca..5ef20148fd6e5e4032eeea8df460c310c4ccf909 100644
--- a/src/views/admin/page-admin-projects.pug
+++ b/src/views/admin/page-admin-projects.pug
@@ -1,21 +1,21 @@
-.content-box.full-width.with-form
+.content-box.full-width
   solid-router(default-route='admin-project-list', hidden)
     solid-route(name='admin-project-list')
     solid-route(name='admin-project-create')
     solid-route(name='project-left')
 
-  div.segment.padding-xlarge.border-bottom
-    div
-      h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title')
-    div.segment.lg-hidden
-      button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='project.list.buttonMobile')
-
   #project-left(hidden, data-view="project-left")
     include ../project/page-project-left.pug
 
   #admin-project-list.content-box__height(hidden, data-view="admin-project-list")
     include ../../templates/hubl-user-avatar.pug
 
+    div.segment.padding-xlarge.border-bottom
+      div
+        h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title')
+      div.segment.lg-hidden
+        button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='project.list.buttonMobile')
+
     div.segment.padding-xlarge
       div.segment.padding-y-small.margin-bottom.clearfix
         div.segment.lg-half.float-left
@@ -154,5 +154,5 @@
         div
         div
 
-  #admin-project-create(hidden, data-view="admin-project-create")
+  #admin-project-create.content-box__height(hidden, data-view="admin-project-create")
     include page-admin-projects-create.pug