diff --git a/src/views/partials/communities/page-community-edit.pug b/src/views/partials/communities/page-community-edit.pug
index 0d91959..57cca4a 100644
--- a/src/views/partials/communities/page-community-edit.pug
+++ b/src/views/partials/communities/page-community-edit.pug
@@ -93,34 +93,26 @@ div.bg-color-white
 
       h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans="communities.edit.subTitle1")
 
-      solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
-        solid-form.segment.half.sm-full.margin-bottom-xlarge.form(
-          bind-resources 
-          nested-field='addresses'
-          fields='address_line1'
+      solid-form.form(
+        bind-resources
+        nested-field="addresses"
+        fields="address_line1, address_line2"
 
-          label-address_line1=""
-          class-address_line1='add-member'
-          widget-address_line1="solid-form-label-text"
+        label-address_line1=""
+        label-address_line2=""
 
-          submit-button=''
-          submit-widget="button"
-          data-trans="label-address_line1=communities.edit.labelAddressLine1"
-        )
+        class-address_line1="segment half sm-full sm-margin-bottom-xsmall padding-right-small text-small text-semibold text-uppercase text-color-heading"
+        class-address_line2="segment half sm-full sm-margin-bottom-xsmall padding-left-small text-small text-semibold text-uppercase text-color-heading"
 
-        solid-form.segment.half-sm-full.margin-bottom-xlarge.form(
-          bind-resources 
-          nested-field='addresses'
-          fields='address_line2'
+        widget-community="solid-form-hidden"
+        widget-address_line1="solid-form-label-text"
+        widget-address_line2="solid-form-label-text"
 
-          label-address_line2=""
-          class-address_line2='add-member'
-          widget-address_line2="solid-form-label-text"
+        submit-button=""
+        submit-widget="button"
 
-          submit-button=''
-          submit-widget="button"
-          data-trans="label-address_line1=communities.edit.labelAddressLine2"
-        )
+        data-trans="label-address_line1=communities.edit.labelAddressLine1;label-address_line2=communities.edit.labelAddressLine2"     
+      )
 
       .segment.table-wrapper.margin-top-medium
         .table
@@ -146,7 +138,7 @@ div.bg-color-white
             multiple-addresses
             multiple-addresses-fields="address_line1, address_line2"
 
-            action-remove='self'
+            action-remove='remove'
             widget-remove='hubl-circle-edit-members-delete'
           )