diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index ff685a70..f8a47850 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -46,7 +46,7 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
     constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @appTitle) ->
         _.bindAll(@)
 
-        @scope.sectionName = "Memberships" #i18n
+        @scope.sectionName = "Manage Members" #i18n
         @scope.project = {}
         @scope.filters = {}
 
diff --git a/app/coffee/modules/admin/roles.coffee b/app/coffee/modules/admin/roles.coffee
index 0ba22f3f..4aff5307 100644
--- a/app/coffee/modules/admin/roles.coffee
+++ b/app/coffee/modules/admin/roles.coffee
@@ -47,7 +47,7 @@ class RolesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fil
     constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @appTitle) ->
         _.bindAll(@)
 
-        @scope.sectionName = "Roles" #i18n
+        @scope.sectionName = "Permissions" #i18n
         @scope.project = {}
 
         promise = @.loadInitialData()
@@ -208,6 +208,8 @@ RolePermissionsDirective = ($rootscope, $repo, $confirm) ->
                     <div class="check">
                         <input type="checkbox" <% if(permission.active) { %>checked="checked"<% } %>/>
                         <div></div>
+                        <span class="check-text check-yes">Yes</span>
+                        <span class="check-text check-no">No</span>
                     </div>
                 </div>
             <% }) %>
diff --git a/app/partials/admin-roles.jade b/app/partials/admin-roles.jade
index 494200d8..8606f13d 100644
--- a/app/partials/admin-roles.jade
+++ b/app/partials/admin-roles.jade
@@ -22,9 +22,11 @@ block content
                 span ({{ role.members_count }} members with this role)
 
             div.general-category
-                | Can do estimations?
+                | When enabled, members assigned to this role will be able to estimate the point value for user stories
                 div.check
                     input(type="checkbox", ng-model="role.computable", ng-change="ctrl.setComputable()")
                     div
+                    span.check-text.check-yes Yes
+                    span.check-text.check-no No
 
             div(tg-role-permissions, ng-model="role")
diff --git a/app/partials/views/modules/admin-menu.jade b/app/partials/views/modules/admin-menu.jade
index 47c78bd3..14cfaef4 100644
--- a/app/partials/views/modules/admin-menu.jade
+++ b/app/partials/views/modules/admin-menu.jade
@@ -14,9 +14,9 @@ section.admin-menu
                     span.icon.icon-arrow-right
             li#adminmenu-memberships
                 a(href="" tg-nav="project-admin-memberships:project=project.slug")
-                    span.title Memberships
+                    span.title Manage members
                     span.icon.icon-arrow-right
             li#adminmenu-roles
                 a(href="" tg-nav="project-admin-roles:project=project.slug")
-                    span.title Roles
+                    span.title Roles & Permissions
                     span.icon.icon-arrow-right
diff --git a/app/partials/views/modules/admin-submenu-project-values.jade b/app/partials/views/modules/admin-submenu-project-values.jade
index 06e09af2..6c6ef246 100644
--- a/app/partials/views/modules/admin-submenu-project-values.jade
+++ b/app/partials/views/modules/admin-submenu-project-values.jade
@@ -1,6 +1,6 @@
 section.admin-submenu
     header
-        h1 Project Values
+        h1 Custom Atrributes
 
     nav
         ul
diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss
index 6a6fe5c8..a5c6753f 100644
--- a/app/styles/modules/admin/admin-roles.scss
+++ b/app/styles/modules/admin/admin-roles.scss
@@ -3,6 +3,7 @@
         @extend %large;
         @extend %title;
         background-color: $whitish;
+        color: $grayer;
         padding: .5rem 1rem;
         span {
             @extend %medium;
@@ -20,10 +21,10 @@
         }
     }
     .check {
-        background-color: #cfcfcf;
+        background-color: darken($whitish, 10%);
         border-radius: 2px;
         cursor: pointer;
-        height: 25px;
+        height: 1.5rem;
         overflow: hidden;
         position: relative;
         width: 65px;
@@ -35,12 +36,28 @@
             position: absolute;
             top: -10px;
             width: 500px;
+            z-index: 999;
             + div {
                 @include transition (all .2s linear);
                 background-color: $button-gray;
                 height: 25px;
                 width: 50%;
             }
+            ~ .check-text {
+                //@include transition(opacity .3s linear);
+                @extend %small;
+                color: $white;
+                position: absolute;
+                top: .1rem;
+            }
+            ~ .check-yes {
+                opacity: 0;
+                right: .5rem;
+            }
+            ~ .check-no {
+                left: .5rem;
+                opacity: .6;
+            }
         }
         input[type=checkbox]:checked {
             + div {
@@ -48,6 +65,14 @@
                 background-color: #74a218;
                 margin-left: 50%;
             }
+            ~ .check-yes {
+                opacity: .6;
+                right: .4rem;
+            }
+            ~ .check-no {
+                left: .4rem;
+                opacity: 0;
+            }
         }
     }
 }