diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 9a090b790..aa2cb5da8 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -183,7 +183,8 @@
                        sg-escape="revertEditing(folder)"/>
               </md-input-container>
               <md-button class="iconButton" label:aria-label="Options"
-                         ng-show="currentFolder.id==folder.id">
+                         ng-show="currentFolder.id==folder.id"
+                         ng-click="share()">
               <i class="md-icon-more-vert"><!-- options --></i>
               </md-button>
             </md-list-item>
diff --git a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
index 1fda8f0aa..e29a11b07 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
@@ -6,44 +6,34 @@
    xmlns:rsrc="OGo:url"
    xmlns:label="OGo:label"
    xmlns:uix="OGo:uix">
-      <div class="addressbookUserRights">
-        <ul>
-          <li>
-            <label>
-              <input type="checkbox" name="canViewObjects"
-                     ng-checked="selectedUser.rights.canViewObjects"
-                     ng-model="selectedUser.rights.canViewObjects"
-                     ng-change="confirmChange(selectedUser)" />
-              <var:string label:value="This person can read the cards of this addressbook." />
-            </label>
-          </li>
-          <li ng-hide="selectedUser.$isAnonymous()">
-            <label>
-              <input type="checkbox" name="canCreateObjects"
-                     ng-checked="selectedUser.rights.canCreateObjects"
-                     ng-model="selectedUser.rights.canCreateObjects"
-                     ng-change="confirmChange(selectedUser)" />
-              <var:string label:value="This person can add cards to this addressbook." />
-            </label>
-          </li>
-          <li ng-hide="selectedUser.$isAnonymous()">
-            <label>
-              <input type="checkbox" name="canEditObjects"
-                     ng-checked="selectedUser.rights.canEditObjects"
-                     ng-model="selectedUser.rights.canEditObjects"
-                     ng-change="confirmChange(selectedUser)" />
-              <var:string label:value="This person can edit the cards of this addressbook." />
-            </label>
-          </li>
-          <li ng-hide="selectedUser.$isAnonymous()">
-            <label>
-              <input type="checkbox" name="canEraseObjects"
-                     ng-checked="selectedUser.rights.canEraseObjects"
-                     ng-model="selectedUser.rights.canEraseObjects"
-                     ng-change="confirmChange(selectedUser)" />
+  <div class="addressbookUserRights" layout="column">
+    
+    <md-checkbox name="canViewObjects"
+                 ng-model="selectedUser.rights.canViewObjects"
+                 ng-change="confirmChange(selectedUser)" >
+      <var:string label:value="This person can read the cards of this addressbook." />
+    </md-checkbox>
+    
+    <md-checkbox name="canCreateObjects"
+                 ng-model="selectedUser.rights.canCreateObjects"
+                 ng-change="confirmChange(selectedUser)"
+                 ng-hide="selectedUser.$isAnonymous()">
+      <var:string label:value="This person can add cards to this addressbook." />
+    </md-checkbox>
+    
+    <md-checkbox name="canEditObjects"
+                 ng-model="selectedUser.rights.canEditObjects"
+                 ng-change="confirmChange(selectedUser)"
+                 ng-hide="selectedUser.$isAnonymous()">
+      <var:string label:value="This person can edit the cards of this addressbook." />
+    </md-checkbox>
+    
+    <md-checkbox name="canEraseObjects"
+                 ng-model="selectedUser.rights.canEraseObjects"
+                 ng-change="confirmChange(selectedUser)"
+                 ng-hide="selectedUser.$isAnonymous()">
               <var:string label:value="This person can erase cards from this addressbook." />
-            </label>
-          </li>
-        </ul>
-      </div>
+    </md-checkbox>
+    
+  </div>
 </container>
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index d13e3b311..b393ee5c1 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -5,70 +5,72 @@
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
-    xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
-  <div id="modalACL">
-    <h2><var:string label:value="Access Rights"/> - <em>{{addressbook.name}}</em></h2>
-    <ul>
-      <!-- left side -->
-      <li>
-        <ul class="aclUsers">
-          <li ng-repeat="user in users | orderBy:['userClass', 'displayName']"
-              ng-click="selectUser(user)"
-              ng-class="{_selected: user==selectedUser}">
-            <span class="card-picture" ng-switch="user.userClass">
-              <i ng-switch-when="normal-user" class="icon-ion-ios7-person"><!-- normal-user --></i>
-              <i ng-switch-when="public-user" class="icon-ion-ios7-people"><!-- public-user --></i>
-            </span>
-            <span class="name">{{user.$shortFormat()}}</span>
-            <span class="subscriptionArea"
+    xmlns:uix="OGo:uix">
+  <md-dialog>
+    <md-content>
+      <md-subheader><var:string label:value="Access Rights"/> - {{stateAddressbook.name}}</md-subheader>
+      
+      <md-list>
+        <md-list-item ng-repeat="user in users | orderBy:['userClass', 'displayName']">
+          <div layout="column">
+            <div layout="row">
+              <md-button ng-click="selectUser(user)">
+                <div layout="row" layout-align="space-between center"
+                     layout-fill="true">
+                  <span class="card-picture" ng-switch="user.userClass">
+                    <div ng-switch-when="normal-user" class="sg-avatar"><!-- normal-user --></div>
+                    <div ng-switch-when="public-user" class="sg-list-avatar"><!-- public-user --></div>
+                  </span>
+                  <span class="name">{{user.$shortFormat()}}</span>
+                </div>
+              </md-button>
+              <md-button
+                  ng-click="removeUser(user)"
+                  type="button"
+                  layout="row" layout-align="end center"
                   ng-hide="user.$isSpecial()">
-              <label>
-                <input type="checkbox"
-                       ng-model="user.isSubscribed"
-                       ng-checked="user.isSubscribed"
-                       ng-disabled="user.wasSubscribed" />
-                <span><var:string label:value="Subscribe User"/></span>
-              </label>
+                <div class="md-icon-delete"><!-- delete --></div>
+              </md-button>
+            </div>
+            <span id="AccessRightList" ng-show="user==selectedUser">
+              <md-checkbox ng-model="user.isSubscribed"
+                           arial-label="Subscribe User"
+                           ng-disabled="user.wasSubscribed"
+                           ng-true-value="1"
+                           ng-false-value="0"
+                           ng-hide="user.$isSpecial()">
+                <var:string label:value="Subscribe User"/>
+              </md-checkbox>
+              <div ng-include="'UIxUserRightsEditor'">
+                <!--
+                    Load ng-template #UIxUserRightsEditor from main module wox. Inner wox templates are:
+                    - UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
+                    - UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
+                    - UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
+                --></div>
             </span>
-          </li>
-        </ul>
-        <form class="addContactsToolbar"
-              ng-submit="addUser(userToAdd)">
-          <table id="bottomTable">
-            <tr>
-              <td id="td_1"><i class="icon-ion-search"><!-- search --></i>
-              <input type="search" class="form-control" label:placeholder="email address"
-                     ng-model="userToAdd"
-                     typeahead-editable="false"
-                     typeahead-wait-ms="500"
-                     typeahead="user as user.$shortFormat() for user in userFilter($viewValue)"/>
-              </td>
-              <td id="td_2">
-                <button type="submit" ><var:string label:value="Add User" /></button>
-                <button type="button"
-                        ng-disabled="!selectedUser || selectedUser.$isSpecial()"
-                        ng-click="removeUser(selectedUser)"><var:string label:value="Remove User"/></button>
-              </td>
-            </tr>
-          </table>
-        </form>
-      </li>
-      <!-- right side -->
-      <li id="AccessRightList" ng-show="selectedUser">
-        <h1>{{selectedUser.$shortFormat({email: false})}}</h1>
-        <div ng-include="'UIxUserRightsEditor'">
-          <!--
-              Load ng-template #UIxUserRightsEditor from main module wox. Inner wox templates are:
-              - UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
-              - UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
-              - UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
-          --></div>
-      </li>
-    </ul>
-  </div>
-  <div id="aclButtons">
-    <button ng-click="closeModal()"><var:string label:value="Close"/></button>
-    <button ng-click="saveModal()"><var:string label:value="Save"/></button>
-  </div>
-  <span class="close-reveal-modal" ng-click="closeModal()"><i class="icon-close"><!-- close --></i></span>
+          </div>
+          <md-divider><!-- divider --></md-divider>
+        </md-list-item>
+        
+        <md-autocomplete
+            md-selected-item="userToAdd"
+            md-search-text="searchText"
+            md-selected-item-change="addUser(user)"
+            md-items="user in userFilter(searchText)"
+            md-item-text="user.shortFormat"
+            md-min-length="0"
+            placeholder="Add">
+          <span md-highlight-text="searchText" md-highlight-flags="^i">{{user.shortFormat}}</span>
+        </md-autocomplete>
+        
+      </md-list>
+      
+      <div id="aclButtons">
+        <md-button ng-click="closeModal()"><var:string label:value="Close"/></md-button>
+        <md-button ng-click="saveModal()"><var:string label:value="Save"/></md-button>
+      </div>
+    </md-content>
+  </md-dialog>
+  
 </container>
diff --git a/UI/WebServerResources/js/ContactsUI.js b/UI/WebServerResources/js/ContactsUI.js
index 17278e784..72bd62055 100644
--- a/UI/WebServerResources/js/ContactsUI.js
+++ b/UI/WebServerResources/js/ContactsUI.js
@@ -103,7 +103,9 @@
       $urlRouterProvider.otherwise('/addressbooks/personal');
     }])
 
-    .controller('AddressBooksCtrl', ['$scope', '$rootScope', '$state', '$stateParams', '$timeout', '$mdDialog', 'sgFocus', 'sgCard', 'sgAddressBook', 'sgDialog', 'sgSettings', 'stateAddressbooks', function($scope, $rootScope, $state, $stateParams, $timeout, $mdDialog, focus, Card, AddressBook, Dialog, Settings, stateAddressbooks) {
+    .controller('AddressBooksCtrl', ['$state', '$scope', '$rootScope', '$stateParams', '$timeout', '$q', '$mdDialog', 'sgFocus', 'sgCard', 'sgAddressBook', 'sgDialog', 'sgSettings', 'sgUser', 'stateAddressbooks', function($state, $scope, $rootScope, $stateParams, $timeout, $q, $mdDialog, focus, Card, AddressBook, Dialog, Settings, User, stateAddressbooks) {
+      var currentAddressbook;
+
       $scope.activeUser = Settings.activeUser;
       $scope.service = AddressBook;
 
@@ -214,23 +216,37 @@
         window.location.href = ApplicationBaseURL + '/' + $rootScope.addressbook.id + '/exportFolder';
       };
       $scope.share = function() {
-        var modal = $modal.open({
-          templateUrl: stateAddressbook.id + '/UIxAclEditor', // UI/Templates/UIxAclEditor.wox
-          resolve: {
-            modalUsers: function() {
-              return stateAddressbook.$acl.$users();
-            }
-          },
-          controller: ['$scope', '$modalInstance', 'sgUser', 'modalUsers', function($scope, $modalInstance, User, modalUsers) {
-            $scope.users = modalUsers; // ACL users
-            $scope.userFilter = User.$filter; // Filter for typeahead
-            $scope.closeModal = function() {
+        $mdDialog.show({
+          templateUrl: $scope.currentFolder.id + '/UIxAclEditor', // UI/Templates/UIxAclEditor.wox
+          controller: AddressBookACLController,
+          clickOutsideToClose: true,
+          escapeToClose: true,
+          locals: {
+            usersWithACL: $scope.currentFolder.$acl.$users(),
+            User: User,
+            stateAddressbook: $scope.currentFolder,
+            q: $q
+          }
+        });
+        function AddressBookACLController($scope, $mdDialog, usersWithACL, User, stateAddressbook, q) {
+          $scope.users = usersWithACL; // ACL users
+          $scope.stateAddressbook = stateAddressbook;
+          $scope.userToAdd = '';
+          $scope.searchText = '';
+          $scope.userFilter = function($query) {
+            var deferred = q.defer();
+            User.$filter($query).then(function(results) {
+              deferred.resolve(results)
+            });
+            return deferred.promise;
+          };
+          $scope.closeModal = function() {
               stateAddressbook.$acl.$resetUsersRights(); // cancel changes
-              $modalInstance.close();
+              $mdDialog.hide();
             };
             $scope.saveModal = function() {
               stateAddressbook.$acl.$saveUsersRights().then(function() {
-                $modalInstance.close();
+                $mdDialog.hide();
               }, function(data, status) {
                 Dialog.alert(l('Warning'), l('An error occured please try again.'));
               });
@@ -253,9 +269,11 @@
                 Dialog.alert(l('Warning'), l('An error occured please try again.'))
               });
             };
-            $scope.addUser = function(data) {
-              $scope.userToAdd = '';
-              stateAddressbook.$acl.$addUser(data).catch(function(error) {
+          $scope.addUser = function(data) {            
+              stateAddressbook.$acl.$addUser(data).then(function() {
+                $scope.userToAdd = '';
+                $scope.searchText = '';
+              }, function(error) {
                 Dialog.alert(l('Warning'), error);
               });
             };
@@ -266,8 +284,7 @@
                 $scope.selectedUser.$rights();
               }
             };
-          }]
-        });
+        };
       };
 
       /**