diff --git a/src/page-circle.pug b/src/page-circle.pug
index 29cd3b9..0f4e3a9 100644
--- a/src/page-circle.pug
+++ b/src/page-circle.pug
@@ -1,5 +1,5 @@
 .views-container.sidebar-is-closed
-  .content-box.full-width.with-form
+  .content-box.flex.full-width.with-form
     div.content-box__header
       sib-ac-checker(permission='acl:Read', bind-resources)
         sib-display(
diff --git a/src/page-messages.pug b/src/page-messages.pug
index 545e643..d1254b2 100644
--- a/src/page-messages.pug
+++ b/src/page-messages.pug
@@ -1,4 +1,4 @@
-.content-box.full-width
+.content-box.flex.full-width
 
   sib-display.content-box__header(
     bind-resources
diff --git a/src/page-project.pug b/src/page-project.pug
index f043e0f..49329b4 100644
--- a/src/page-project.pug
+++ b/src/page-project.pug
@@ -1,5 +1,5 @@
 .views-container.sidebar-is-closed
-  .content-box.full-width.with-form
+  .content-box.flex.full-width.with-form
     div.content-box__header
       sib-ac-checker(permission='acl:Read', bind-resources)
         sib-display(
diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index a166abb..1e64559 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -154,6 +154,7 @@ h5 {
   font-size: 2rem;
 }
 
+<<<<<<< HEAD
 %padding-main {
   padding: 1.3rem;
 }
@@ -162,6 +163,8 @@ h5 {
   padding: 3.2rem;
 }
 
+=======
+>>>>>>> d9b2c89... update: flex class added in other files + %padding removed
 .avatar {
   align-items: center;
   background-color: var(--color-avatar-background);
@@ -190,7 +193,6 @@ h5 {
 
 .content-box {
   @include window-style-modal();
-  display: flex;
   flex-direction: column;
   flex-grow: 1;
   margin: 2rem 1rem 5rem 2rem;
@@ -202,10 +204,6 @@ h5 {
     margin: 0 auto;
     min-height: 100%;
   }
-
-  &.with-padding {
-    @extend %padding-main;
-  }
 }
 
 /* Header inside circle, project view  */
@@ -268,8 +266,8 @@ h5 {
 }
 
 .content-box__info {
-  @extend %padding-block;
   flex-direction: column;
+  padding: 3.2rem;
 }
 
 /*.modal {
@@ -329,7 +327,6 @@ h5 {
 }
 
 .space-between {
-  display: flex;
   justify-content: space-between;
   padding-bottom: 1.4rem;
 }
diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss
index 682f3c7..90bd98c 100644
--- a/src/styles/components/sidebar.scss
+++ b/src/styles/components/sidebar.scss
@@ -1,9 +1,13 @@
 .no-sidebar {
   flex: 1;
+<<<<<<< HEAD
 
   &.with-padding {
     @extend %padding-main;
   }
+=======
+  padding: 5rem;
+>>>>>>> d9b2c89... update: flex class added in other files + %padding removed
 }
 
 .with-sidebar {
diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug
index 2fc199b..4b1dcda 100644
--- a/src/views/admin/page-admin-circles.pug
+++ b/src/views/admin/page-admin-circles.pug
@@ -1,4 +1,4 @@
-.content-box.full-width.with-form
+.content-box.flex.full-width.with-form
   sib-router(default-route='admin-circle-list', hidden)
     sib-route(name='admin-circle-list')
     sib-route(name='admin-circle-create')
diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug
index a70260b..238e254 100644
--- a/src/views/admin/page-admin-projects.pug
+++ b/src/views/admin/page-admin-projects.pug
@@ -1,4 +1,4 @@
-.content-box.full-width.with-form
+.content-box.flex.full-width.with-form
   sib-router(default-route='admin-project-list', hidden)
     sib-route(name='admin-project-list')
     sib-route(name='admin-project-create')
diff --git a/src/views/admin/page-admin-users.pug b/src/views/admin/page-admin-users.pug
index 2a9d5a0..1680752 100644
--- a/src/views/admin/page-admin-users.pug
+++ b/src/views/admin/page-admin-users.pug
@@ -1,4 +1,4 @@
-.content-box.full-width.with-form
+.content-box.flex.full-width.with-form
   sib-router(default-route='admin-users-list', hidden)
     sib-route(name='admin-users-list')
     sib-route(name='admin-users-create')
diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug
index d880640..d17bc9b 100644
--- a/src/views/circle/page-circle-profile.pug
+++ b/src/views/circle/page-circle-profile.pug
@@ -6,7 +6,7 @@ sib-router(default-route='circle-profile', hidden)
   include ../../templates/hubl-circle-team.pug
   .content-box__info.flex
 
-    .space-between
+    .flex.space-between
       sib-display(
         bind-resources
         fields='creationDateSet(title, creationDate)'
diff --git a/src/views/project/page-project-chat.pug b/src/views/project/page-project-chat.pug
index cd2c4c2..c7aed59 100644
--- a/src/views/project/page-project-chat.pug
+++ b/src/views/project/page-project-chat.pug
@@ -1,4 +1,4 @@
-.content-box.with-padding.full-width.chat-view
+.content-box.flex.full-width.chat-view
   sib-chat(
     data-authentication='login',
     data-auto-login='true',
diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug
index 078e22b..c6fc36a 100644
--- a/src/views/project/page-project-profile.pug
+++ b/src/views/project/page-project-profile.pug
@@ -9,7 +9,7 @@ sib-router(default-route='project-profile', hidden)
 
   .content-box__info.flex
 
-    .space-between
+    .flex.space-between
       sib-display(
         bind-resources
         fields='creationDateSet(title, creationDate)'
@@ -24,7 +24,7 @@ sib-router(default-route='project-profile', hidden)
         sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre
 
     
-    .space-between
+    .flex.space-between
       sib-display(
         bind-resources
         fields='label-captain, captain'