Functionality added and all tests working.

Update correct use of permissions form.

app/templates/flash_messages.html

@@ -5,7 +5,7 @@
       {{ banner(
         message,
         'default' if ((category == 'default') or (category == 'default_with_tick')) else 'dangerous',
-        delete_button="Yes, delete" if 'delete' == category else None,
+        delete_button="Yes, {}".format(category) if category in ['delete', 'remove'] else None,
         with_tick=True if category == 'default_with_tick' else False
       )}}
     {% endfor %}

app/templates/views/edit-user-permissions.html

@@ -21,11 +21,11 @@ Manage users – GOV.UK Notify
 
       {% include 'views/manage-users/permissions.html' %}
 
-      {{ page_footer(
-        'Save',
-        back_link=url_for('.manage_users', service_id=service_id),
-        back_link_text='Cancel'
-      ) }}
+        {{ page_footer(
+          'Save',
+          delete_link=url_for('.remove_user_from_service', service_id=service_id, user_id=user.id) if user or None,
+          delete_link_text='Remove user from service'
+        ) }}
 
     </form>
   </div>

app/templates/views/manage-users.html

@@ -45,7 +45,7 @@ Manage users – GOV.UK Notify
     {% call field(align='right') %}
       {% if current_user.has_permissions(['manage_users']) %}
         {% if current_user.id != item.id %}
-          <a href="{{ url_for('.edit_user_permissions', service_id=service_id, user_id=item.id)}}">Edit permission</a>
+          <a href="{{ url_for('.edit_user_permissions', service_id=service_id, user_id=item.id)}}">Edit</a>
         {% endif %}
       {% endif %}
     {% endcall %}