diff --git a/scm-ui/src/config/roles/components/AvailableVerbs.js b/scm-ui/src/config/roles/components/AvailableVerbs.js
index dbe0b50a77..729e977e95 100644
--- a/scm-ui/src/config/roles/components/AvailableVerbs.js
+++ b/scm-ui/src/config/roles/components/AvailableVerbs.js
@@ -7,7 +7,9 @@ import injectSheet from "react-jss";
 
 type Props = {
   role: RepositoryRole,
+
   // context props
+  classes: any,
   t: string => string
 };
 
diff --git a/scm-ui/src/config/roles/components/PermissionRoleDetails.js b/scm-ui/src/config/roles/components/PermissionRoleDetails.js
index 1977ddde2a..d1b48fc8b5 100644
--- a/scm-ui/src/config/roles/components/PermissionRoleDetails.js
+++ b/scm-ui/src/config/roles/components/PermissionRoleDetails.js
@@ -4,7 +4,7 @@ import { translate } from "react-i18next";
 import type { RepositoryRole } from "@scm-manager/ui-types";
 import ExtensionPoint from "@scm-manager/ui-extensions/lib/ExtensionPoint";
 import PermissionRoleDetailsTable from "./PermissionRoleDetailsTable";
-import { Button, Subtitle } from "@scm-manager/ui-components";
+import { Button } from "@scm-manager/ui-components";
 
 type Props = {
   role: RepositoryRole,
diff --git a/scm-ui/src/config/roles/components/PermissionRoleDetailsTable.js b/scm-ui/src/config/roles/components/PermissionRoleDetailsTable.js
index dd0502cb02..28ab5e1f14 100644
--- a/scm-ui/src/config/roles/components/PermissionRoleDetailsTable.js
+++ b/scm-ui/src/config/roles/components/PermissionRoleDetailsTable.js
@@ -6,6 +6,7 @@ import AvailableVerbs from "./AvailableVerbs";
 
 type Props = {
   role: RepositoryRole,
+
   // context props
   t: string => string
 };
@@ -16,18 +17,18 @@ class PermissionRoleDetailsTable extends React.Component<Props> {
     return (
       <table className="table content">
         <tbody>
-          <tr>
-            <th>{t("repositoryRole.name")}</th>
-            <td>{role.name}</td>
-          </tr>
-          <tr>
-            <th>{t("repositoryRole.type")}</th>
-            <td>{role.type}</td>
-          </tr>
-          <tr>
-            <th>{t("repositoryRole.verbs")}</th>
-            <AvailableVerbs role={role} />
-          </tr>
+        <tr>
+          <th>{t("repositoryRole.name")}</th>
+          <td>{role.name}</td>
+        </tr>
+        <tr>
+          <th>{t("repositoryRole.type")}</th>
+          <td>{role.type}</td>
+        </tr>
+        <tr>
+          <th>{t("repositoryRole.verbs")}</th>
+          <AvailableVerbs role={role} />
+        </tr>
         </tbody>
       </table>
     );
diff --git a/scm-ui/src/config/roles/components/PermissionRoleTable.js b/scm-ui/src/config/roles/components/PermissionRoleTable.js
index bb98f7c3e9..dddf30a888 100644
--- a/scm-ui/src/config/roles/components/PermissionRoleTable.js
+++ b/scm-ui/src/config/roles/components/PermissionRoleTable.js
@@ -8,6 +8,7 @@ type Props = {
   baseUrl: string,
   roles: RepositoryRole[],
 
+  // context props
   t: string => string
 };
 
@@ -17,16 +18,16 @@ class PermissionRoleTable extends React.Component<Props> {
     return (
       <table className="card-table table is-hoverable is-fullwidth">
         <thead>
-          <tr>
-            <th>{t("repositoryRole.form.name")}</th>
-          </tr>
+        <tr>
+          <th>{t("repositoryRole.form.name")}</th>
+        </tr>
         </thead>
         <tbody>
-          {roles.map((role, index) => {
-            return (
-              <PermissionRoleRow key={index} baseUrl={baseUrl} role={role} />
-            );
-          })}
+        {roles.map((role, index) => {
+          return (
+            <PermissionRoleRow key={index} baseUrl={baseUrl} role={role} />
+          );
+        })}
         </tbody>
       </table>
     );
diff --git a/scm-ui/src/config/roles/components/SystemRoleTag.js b/scm-ui/src/config/roles/components/SystemRoleTag.js
index 0f6b87addc..f9e907de35 100644
--- a/scm-ui/src/config/roles/components/SystemRoleTag.js
+++ b/scm-ui/src/config/roles/components/SystemRoleTag.js
@@ -6,6 +6,8 @@ import { translate } from "react-i18next";
 
 type Props = {
   system?: boolean,
+
+  // context props
   classes: any,
   t: string => string
 };
diff --git a/scm-ui/src/config/roles/containers/CreateRepositoryRole.js b/scm-ui/src/config/roles/containers/CreateRepositoryRole.js
index 88f42f8353..75380ada92 100644
--- a/scm-ui/src/config/roles/containers/CreateRepositoryRole.js
+++ b/scm-ui/src/config/roles/containers/CreateRepositoryRole.js
@@ -15,11 +15,13 @@ import {
   getRepositoryRolesLink,
   getRepositoryVerbsLink
 } from "../../../modules/indexResource";
+import type {History} from "history";
 
 type Props = {
   disabled: boolean,
   repositoryRolesLink: string,
   error?: Error,
+  history: History,
 
   //dispatch function
   addRole: (link: string, role: RepositoryRole, callback?: () => void) => void,
diff --git a/scm-ui/src/config/roles/containers/RepositoryRoles.js b/scm-ui/src/config/roles/containers/RepositoryRoles.js
index f148b120e0..06492add5b 100644
--- a/scm-ui/src/config/roles/containers/RepositoryRoles.js
+++ b/scm-ui/src/config/roles/containers/RepositoryRoles.js
@@ -36,6 +36,7 @@ type Props = {
   // context objects
   t: string => string,
   history: History,
+  location: any,
 
   // dispatch functions
   fetchRolesByPage: (link: string, page: number) => void