diff --git a/scm-ui/public/locales/en/config.json b/scm-ui/public/locales/en/config.json
index bdb245544a..66ddea3ee2 100644
--- a/scm-ui/public/locales/en/config.json
+++ b/scm-ui/public/locales/en/config.json
@@ -9,30 +9,28 @@
   "repositoryRole": {
     "navLink": "Permission Roles",
     "title": "Permission Roles",
-    "noPermissionRoles": "No permission roles found.",
-    "system": "System",
-    "createButton": "Create Permission Role",
+    "errorTitle": "Error",
+    "errorSubtitle": "Unknown Permission Role Error",
+    "createSubtitle": "Create Permission Role",
+    "editSubtitle": "Edit Permission Role",
+    "overview": {
+      "title": "Overview of all permission roles",
+      "noPermissionRoles": "No permission roles found.",
+      "createButton": "Create Permission Role"
+    },
+    "details": {
+      "editButton": "Edit"
+    },
     "name": "Name",
     "type": "Type",
     "verbs": "Verbs",
-    "edit": "Edit Permission Role",
-    "button": {
-      "edit": "Edit"
-    },
-    "create": {
-      "name": "Name"
-    },
+    "system": "System",
     "form": {
-      "subtitle": "Edit Permission Role",
       "name": "Name",
       "permissions": "Permissions",
       "submit": "Save"
     }
   },
-  "role": {
-    "name": "Name",
-    "system": "System"
-  },
   "config-form": {
     "submit": "Submit",
     "submit-success-notification": "Configuration changed successfully!",
diff --git a/scm-ui/src/config/roles/components/PermissionRoleDetails.js b/scm-ui/src/config/roles/components/PermissionRoleDetails.js
index 307eb6b48e..6f5121e227 100644
--- a/scm-ui/src/config/roles/components/PermissionRoleDetails.js
+++ b/scm-ui/src/config/roles/components/PermissionRoleDetails.js
@@ -20,7 +20,7 @@ class PermissionRoleDetails extends React.Component<Props> {
     if (!!this.props.role._links.update) {
       return (
         <Button
-          label={t("repositoryRole.button.edit")}
+          label={t("repositoryRole.details.editButton")}
           link={`${url}/edit`}
           color="primary"
         />
diff --git a/scm-ui/src/config/roles/components/PermissionRoleTable.js b/scm-ui/src/config/roles/components/PermissionRoleTable.js
index dddf30a888..13c5d775d1 100644
--- a/scm-ui/src/config/roles/components/PermissionRoleTable.js
+++ b/scm-ui/src/config/roles/components/PermissionRoleTable.js
@@ -19,7 +19,7 @@ class PermissionRoleTable extends React.Component<Props> {
       <table className="card-table table is-hoverable is-fullwidth">
         <thead>
         <tr>
-          <th>{t("repositoryRole.form.name")}</th>
+          <th>{t("repositoryRole.name")}</th>
         </tr>
         </thead>
         <tbody>
diff --git a/scm-ui/src/config/roles/components/SystemRoleTag.js b/scm-ui/src/config/roles/components/SystemRoleTag.js
index f9e907de35..8aad57eddc 100644
--- a/scm-ui/src/config/roles/components/SystemRoleTag.js
+++ b/scm-ui/src/config/roles/components/SystemRoleTag.js
@@ -26,7 +26,7 @@ class SystemRoleTag extends React.Component<Props> {
     if (system) {
       return (
         <span className={classNames("tag is-dark", classes.tag)}>
-          {t("role.system")}
+          {t("repositoryRole.system")}
         </span>
       );
     }
diff --git a/scm-ui/src/config/roles/containers/RepositoryRoleForm.js b/scm-ui/src/config/roles/containers/RepositoryRoleForm.js
index 9af8ac75f8..9269af3838 100644
--- a/scm-ui/src/config/roles/containers/RepositoryRoleForm.js
+++ b/scm-ui/src/config/roles/containers/RepositoryRoleForm.js
@@ -120,12 +120,17 @@ class RepositoryRoleForm extends React.Component<Props, State> {
       <form onSubmit={this.submit}>
         <InputField
           name="name"
-          label={t("repositoryRole.create.name")}
+          label={t("repositoryRole.form.name")}
           onChange={this.handleNameChange}
           value={role.name ? role.name : ""}
           disabled={!!this.props.role}
         />
-        {verbSelectBoxes}
+        <div className="field">
+          <label className="label">
+            {t("repositoryRole.form.permissions")}
+          </label>
+          {verbSelectBoxes}
+        </div>
         <hr />
         <SubmitButton
           loading={loading}
diff --git a/scm-ui/src/config/roles/containers/RepositoryRoles.js b/scm-ui/src/config/roles/containers/RepositoryRoles.js
index a9dd967897..689c8cf1cc 100644
--- a/scm-ui/src/config/roles/containers/RepositoryRoles.js
+++ b/scm-ui/src/config/roles/containers/RepositoryRoles.js
@@ -7,6 +7,7 @@ import type { History } from "history";
 import type { RepositoryRole, PagedCollection } from "@scm-manager/ui-types";
 import {
   Title,
+  Subtitle,
   Loading,
   Notification,
   LinkPaginator,
@@ -57,11 +58,12 @@ class RepositoryRoles extends React.Component<Props> {
     }
 
     return (
-      <div>
+      <>
         <Title title={t("repositoryRole.title")} />
+        <Subtitle subtitle={t("repositoryRole.overview.title")} />
         {this.renderPermissionsTable()}
         {this.renderCreateButton()}
-      </div>
+      </>
     );
   }
 
@@ -77,7 +79,7 @@ class RepositoryRoles extends React.Component<Props> {
     }
     return (
       <Notification type="info">
-        {t("repositoryRole.noPermissionRoles")}
+        {t("repositoryRole.overview.noPermissionRoles")}
       </Notification>
     );
   }
@@ -87,7 +89,7 @@ class RepositoryRoles extends React.Component<Props> {
     if (canAddRoles) {
       return (
         <CreateButton
-          label={t("repositoryRole.createButton")}
+          label={t("repositoryRole.overview.createButton")}
           link={`${baseUrl}/create`}
         />
       );