diff --git a/src/index.pug b/src/index.pug
index 76d9580..cf0f8d0 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -35,10 +35,6 @@ html(lang="en")
         #circle(hidden).with-sidebar
           include page-circle.pug
 
-        #circle-edit(hidden).no-sidebar
-          sib-link(class="backlink", bind-resources, next='circle') Back
-          include page-circle-edit.pug
-
         #messages(hidden).with-sidebar
           include page-messages.pug
         
diff --git a/src/menu-left.pug b/src/menu-left.pug
index 89f082a..1213473 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -81,7 +81,6 @@ nav#main__menu
           order-by='username'
           next='messages'
         )
-    sib-route(hidden, name='circle-edit', use-id='')
 
     //- div.divider
     //- sib-route.menu(hidden, name='my-profile', rdf-type='foaf:user', use-id='')
diff --git a/src/page-circle-edit.pug b/src/page-circle-edit.pug
index f03f232..1121969 100644
--- a/src/page-circle-edit.pug
+++ b/src/page-circle-edit.pug
@@ -1,4 +1,4 @@
-#circle-edit.content-box.with-padding.with-form
+div.content-box__info
 
   include templates/hd-user-avatar.pug
 
@@ -32,8 +32,10 @@
         data-src="${await value['@id']}"
       )
 
+  sib-link(class="backlink", bind-resources, next='circle-profile') Back
+
   h1 Edit your circle
-  
+
   sib-form.block(
     bind-resources
     
@@ -53,7 +55,7 @@
 
     submit-button='Save'
   )
-  
+
   h2 Members list
 
   div.table-header
diff --git a/src/page-circle-profile.pug b/src/page-circle-profile.pug
index 507818a..72d0f52 100644
--- a/src/page-circle-profile.pug
+++ b/src/page-circle-profile.pug
@@ -1,49 +1,55 @@
 .content-box.full-width.with-form
+  sib-router(default-route='circle-profile')
+    sib-route(name='circle-profile')
+    sib-route(name='circle-edit')
 
-  include templates/hd-circle-team.pug
-  
-  div.content-box__header.with-edit
-    sib-display(
-      bind-resources
-      fields='name'
+  #circle-profile(hidden)
+    include templates/hd-circle-team.pug
+    
+    div.content-box__header.with-edit
+      sib-display(
+        bind-resources
+        fields='name'
 
-      class-name='name'
-    )
-
-    sib-link(class="editlink", next="circle-edit" bind-resources)
-
-  div.content-box__info
-
-    sib-display.block(
-      bind-resources
-      fields='label-description, description, entitled(title, creationDate)'
-
-      value-label-description='Description: '
-
-      default-description='No description available.'
-
-      value-title='Creation date:'
-    )
-
-    sib-ac-checker(permission='acl:Write' bind-resources)
-      sib-form.block.team-form(
-        bind-resources 
-        fields='team'
-        range-team=`${endpoints.users}`
-        partial=''
-
-        class-team='team form-label is-dark'
-        label-team='Members:'
-        widget-team='sib-form-auto-completion'
-
-        submit-button='Add a member'
+        class-name='name'
       )
 
-    sib-display.block(
-      bind-resources
-      fields='team'
+      sib-link(class="editlink", next="circle-edit" bind-resources)
 
-      multiple-team=''
-      widget-team='team-template'
-    )
+    div.content-box__info
 
+      sib-display.block(
+        bind-resources
+        fields='label-description, description, entitled(title, creationDate)'
+
+        value-label-description='Description: '
+
+        default-description='No description available.'
+
+        value-title='Creation date:'
+      )
+
+      sib-ac-checker(permission='acl:Write' bind-resources)
+        sib-form.block.team-form(
+          bind-resources 
+          fields='team'
+          range-team=`${endpoints.users}`
+          partial=''
+
+          class-team='team form-label is-dark'
+          label-team='Members:'
+          widget-team='sib-form-auto-completion'
+
+          submit-button='Add a member'
+        )
+
+      sib-display.block(
+        bind-resources
+        fields='team'
+
+        multiple-team=''
+        widget-team='team-template'
+      )
+
+  #circle-edit(hidden)
+    include page-circle-edit.pug
\ No newline at end of file
diff --git a/src/page-circle.pug b/src/page-circle.pug
index 25f48b3..f132b75 100644
--- a/src/page-circle.pug
+++ b/src/page-circle.pug
@@ -1,7 +1,7 @@
 .views-container
-  #circle-chat
+  #circle-chat(hidden)
     include page-circle-chat.pug
-  #circle-profile
+  #circle-information(hidden)
     include page-circle-profile.pug
   //-#circle-create
     include page-circle-create.pug
@@ -13,9 +13,6 @@ nav.jsRightMenu(role='navigation')
       sib-route(name='circle-chat')
         li
           a Chat
-      sib-route(name='circle-profile')
+      sib-route(name='circle-information')
         li
           a Information
-      //-sib-route(name='circle-create')
-        li
-          a Add new
diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss
index 2377358..cea2695 100644
--- a/src/styles/components/sidebar.scss
+++ b/src/styles/components/sidebar.scss
@@ -89,7 +89,7 @@
             @include ci('list');
           }
 
-          &[name$='profile']>li {
+          &[name$='profile']>li, &[name$='information']>li  {
             @include ci('information');
           }
 
diff --git a/src/styles/layout/circle-profile/circle-profile.scss b/src/styles/layout/circle-profile/circle-profile.scss
index c4d75e4..834985a 100644
--- a/src/styles/layout/circle-profile/circle-profile.scss
+++ b/src/styles/layout/circle-profile/circle-profile.scss
@@ -1,7 +1,12 @@
-#circle-profile {
+#circle-information, #circle-edit {
 
   .content-box__info {
     @extend %padding-block;
+
+    .backlink {
+      text-align: right;
+      display: block;
+    }
   }
 
   .block {