diff --git a/scm-plugins/scm-git-plugin/src/main/js/index.js b/scm-plugins/scm-git-plugin/src/main/js/index.js
index a066247dde..5534d2061a 100644
--- a/scm-plugins/scm-git-plugin/src/main/js/index.js
+++ b/scm-plugins/scm-git-plugin/src/main/js/index.js
@@ -28,7 +28,7 @@ binder.bind(
 binder.bind("repos.repository-avatar", GitAvatar, gitPredicate);
 
 cfgBinder.bindRepository(
-  "/configuration",
+  "/settings/configuration",
   "scm-git-plugin.repo-config.link",
   "configuration",
   RepositoryConfig
diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index 68f5b4a53b..4693dedfd6 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -17,11 +17,15 @@
     "create-button": "Create"
   },
   "repository-root": {
-    "navigationLabel": "Repository Navigation",
-    "historyNavLink": "Commits",
-    "informationNavLink": "Information",
-    "permissionsNavLink": "Permissions",
-    "sourcesNavLink": "Sources",
+    "menu": {
+      "navigationLabel": "Repository Navigation",
+      "informationNavLink": "Information",
+      "historyNavLink": "Commits",
+      "sourcesNavLink": "Sources",
+      "settingsNavLink": "Settings",
+      "editNavLink": "General",
+      "permissionsNavLink": "Permissions"
+    },
     "errorTitle": "Error",
     "errorSubtitle": "Unknown repository error"
   },
diff --git a/scm-ui/src/repos/components/DeleteNavAction.js b/scm-ui/src/repos/components/DeleteNavAction.js
index c2369a5bfb..a81cb17f66 100644
--- a/scm-ui/src/repos/components/DeleteNavAction.js
+++ b/scm-ui/src/repos/components/DeleteNavAction.js
@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import { translate } from "react-i18next";
-import { NavAction, confirmAlert } from "@scm-manager/ui-components";
+import { Subtitle, DeleteButton, confirmAlert } from "@scm-manager/ui-components";
 import type { Repository } from "@scm-manager/ui-types";
 
 type Props = {
@@ -25,15 +25,15 @@ class DeleteNavAction extends React.Component<Props> {
   confirmDelete = () => {
     const { t } = this.props;
     confirmAlert({
-      title: t("delete-nav-action.confirm-alert.title"),
-      message: t("delete-nav-action.confirm-alert.message"),
+      title: t("repository.delete.confirm-alert.title"),
+      message: t("repository.delete.confirm-alert.message"),
       buttons: [
         {
-          label: t("delete-nav-action.confirm-alert.submit"),
+          label: t("repository.delete.confirm-alert.submit"),
           onClick: () => this.delete()
         },
         {
-          label: t("delete-nav-action.confirm-alert.cancel"),
+          label: t("repository.delete.confirm-alert.cancel"),
           onClick: () => null
         }
       ]
@@ -51,7 +51,20 @@ class DeleteNavAction extends React.Component<Props> {
     if (!this.isDeletable()) {
       return null;
     }
-    return <NavAction label={t("delete-nav-action.label")} action={action} />;
+
+    return (
+      <>
+        <Subtitle subtitle={t("repository.delete.subtitle")} />
+        <div className="columns">
+          <div className="column">
+            <DeleteButton
+              label={t("repository.delete.button")}
+              action={action}
+            />
+          </div>
+        </div>
+      </>
+    );
   }
 }
 
diff --git a/scm-ui/src/repos/components/EditNavLink.js b/scm-ui/src/repos/components/EditNavLink.js
index 1a49fdee81..2163624e4d 100644
--- a/scm-ui/src/repos/components/EditNavLink.js
+++ b/scm-ui/src/repos/components/EditNavLink.js
@@ -15,7 +15,7 @@ class EditNavLink extends React.Component<Props> {
       return null;
     }
     const { editUrl, t } = this.props;
-    return <NavLink to={editUrl} label={t("edit-nav-link.label")} />;
+    return <NavLink to={editUrl} label={t("repository-root.menu.editNavLink")} />;
   }
 }
 
diff --git a/scm-ui/src/repos/components/PermissionsNavLink.js b/scm-ui/src/repos/components/PermissionsNavLink.js
index 937980fd3d..364c274f6b 100644
--- a/scm-ui/src/repos/components/PermissionsNavLink.js
+++ b/scm-ui/src/repos/components/PermissionsNavLink.js
@@ -20,7 +20,7 @@ class PermissionsNavLink extends React.Component<Props> {
     }
     const { permissionUrl, t } = this.props;
     return (
-      <NavLink to={permissionUrl} label={t("repository-root.permissionsNavLink")} />
+      <NavLink to={permissionUrl} label={t("repository-root.menu.permissionsNavLink")} />
     );
   }
 }
diff --git a/scm-ui/src/repos/components/PermissionsNavLink.test.js b/scm-ui/src/repos/components/PermissionsNavLink.test.js
index 450c7f49e6..5dddfe0cf4 100644
--- a/scm-ui/src/repos/components/PermissionsNavLink.test.js
+++ b/scm-ui/src/repos/components/PermissionsNavLink.test.js
@@ -33,6 +33,6 @@ describe("PermissionsNavLink", () => {
       <PermissionsNavLink repository={repository} permissionUrl="" />,
       options.get()
     );
-    expect(navLink.text()).toBe("repository-root.permissions");
+    expect(navLink.text()).toBe("repository-root.menu.permissions");
   });
 });
diff --git a/scm-ui/src/repos/components/form/RepositoryForm.js b/scm-ui/src/repos/components/form/RepositoryForm.js
index 8f5d932778..cc0b409175 100644
--- a/scm-ui/src/repos/components/form/RepositoryForm.js
+++ b/scm-ui/src/repos/components/form/RepositoryForm.js
@@ -2,6 +2,7 @@
 import React from "react";
 import { translate } from "react-i18next";
 import {
+  Subtitle,
   InputField,
   Select,
   SubmitButton,
@@ -82,29 +83,32 @@ class RepositoryForm extends React.Component<Props, State> {
     const repository = this.state.repository;
 
     return (
-      <form onSubmit={this.submit}>
-        {this.renderCreateOnlyFields()}
-        <InputField
-          label={t("repository.contact")}
-          onChange={this.handleContactChange}
-          value={repository ? repository.contact : ""}
-          validationError={this.state.contactValidationError}
-          errorMessage={t("validation.contact-invalid")}
-          helpText={t("help.contactHelpText")}
-        />
+      <>
+        <Subtitle subtitle={t("repository.edit.subtitle")} />
+        <form onSubmit={this.submit}>
+          {this.renderCreateOnlyFields()}
+          <InputField
+            label={t("repository.contact")}
+            onChange={this.handleContactChange}
+            value={repository ? repository.contact : ""}
+            validationError={this.state.contactValidationError}
+            errorMessage={t("validation.contact-invalid")}
+            helpText={t("help.contactHelpText")}
+          />
 
-        <Textarea
-          label={t("repository.description")}
-          onChange={this.handleDescriptionChange}
-          value={repository ? repository.description : ""}
-          helpText={t("help.descriptionHelpText")}
-        />
-        <SubmitButton
-          disabled={!this.isValid()}
-          loading={loading}
-          label={t("repository-form.submit")}
-        />
-      </form>
+          <Textarea
+            label={t("repository.description")}
+            onChange={this.handleDescriptionChange}
+            value={repository ? repository.description : ""}
+            helpText={t("help.descriptionHelpText")}
+          />
+          <SubmitButton
+            disabled={!this.isValid()}
+            loading={loading}
+            label={t("repository-form.submit")}
+          />
+        </form>
+      </>
     );
   }
 
diff --git a/scm-ui/src/repos/containers/Edit.js b/scm-ui/src/repos/containers/Edit.js
index 816dae8de9..7341bcbd3e 100644
--- a/scm-ui/src/repos/containers/Edit.js
+++ b/scm-ui/src/repos/containers/Edit.js
@@ -48,6 +48,8 @@ class Edit extends React.Component<Props> {
             this.props.modifyRepo(repo, this.repoModified);
           }}
         />
+        <hr />
+        <p>TODO: DeleteRepo hier einbinden. Aktuell heißt es noch DeleteNavAction</p>
       </div>
     );
   }
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 9fcae12c53..1a7ca7eaea 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -6,7 +6,7 @@ import {connect} from "react-redux";
 import {Route, Switch} from "react-router-dom";
 import type {Repository} from "@scm-manager/ui-types";
 
-import {ErrorPage, Loading, Navigation, NavLink, Page, Section} from "@scm-manager/ui-components";
+import {ErrorPage, Loading, Navigation, SubNavigation, NavLink, Page, Section} from "@scm-manager/ui-components";
 import {translate} from "react-i18next";
 import RepositoryDetails from "../components/RepositoryDetails";
 import DeleteNavAction from "../components/DeleteNavAction";
@@ -109,11 +109,11 @@ class RepositoryRoot extends React.Component<Props> {
                 component={() => <RepositoryDetails repository={repository} />}
               />
               <Route
-                path={`${url}/edit`}
+                path={`${url}/settings/general`}
                 component={() => <Edit repository={repository} />}
               />
               <Route
-                path={`${url}/permissions`}
+                path={`${url}/settings/permissions`}
                 render={() => (
                   <Permissions
                     namespace={this.props.repository.namespace}
@@ -168,13 +168,13 @@ class RepositoryRoot extends React.Component<Props> {
           </div>
           <div className="column">
             <Navigation>
-              <Section label={t("repository-root.navigationLabel")}>
-                <NavLink to={url} label={t("repository-root.informationNavLink")} />
+              <Section label={t("repository-root.menu.navigationLabel")}>
+                <NavLink to={url} label={t("repository-root.menu.informationNavLink")} />
                 <RepositoryNavLink
                   repository={repository}
                   linkName="changesets"
                   to={`${url}/changesets/`}
-                  label={t("repository-root.historyNavLink")}
+                  label={t("repository-root.menu.historyNavLink")}
                   activeWhenMatch={this.matches}
                   activeOnlyWhenExact={false}
                 />
@@ -182,18 +182,24 @@ class RepositoryRoot extends React.Component<Props> {
                   repository={repository}
                   linkName="sources"
                   to={`${url}/sources`}
-                  label={t("repository-root.sourcesNavLink")}
+                  label={t("repository-root.menu.sourcesNavLink")}
                   activeOnlyWhenExact={false}
                 />
-                <PermissionsNavLink
-                  permissionUrl={`${url}/permissions`}
-                  repository={repository}
-                />
-                <ExtensionPoint
-                  name="repository.navigation"
-                  props={extensionProps}
-                  renderAll={true}
-                />
+                <SubNavigation
+                  to={`${url}/settings/general`}
+                  label={t("repository-root.menu.settingsNavLink")}
+                >
+                  <EditNavLink repository={repository} editUrl={`${url}/settings/general`} />
+                  <PermissionsNavLink
+                    permissionUrl={`${url}/settings/permissions`}
+                    repository={repository}
+                  />
+                  <ExtensionPoint
+                    name="repository.navigation"
+                    props={extensionProps}
+                    renderAll={true}
+                  />
+                </SubNavigation>
               </Section>
             </Navigation>
           </div>
diff --git a/scm-ui/src/users/components/DeleteUser.js b/scm-ui/src/users/components/DeleteUser.js
index 58d8d446dd..1a250fa58d 100644
--- a/scm-ui/src/users/components/DeleteUser.js
+++ b/scm-ui/src/users/components/DeleteUser.js
@@ -2,15 +2,20 @@
 import React from "react";
 import { translate } from "react-i18next";
 import type { User } from "@scm-manager/ui-types";
-import { DeleteButton, confirmAlert } from "@scm-manager/ui-components";
-import {connect} from "react-redux";
 import {
-  deleteUser, fetchUserByName,
+  Subtitle,
+  DeleteButton,
+  confirmAlert
+} from "@scm-manager/ui-components";
+import { connect } from "react-redux";
+import {
+  deleteUser,
+  fetchUserByName,
   getDeleteUserFailure,
   getUserByName,
-  isDeleteUserPending,
+  isDeleteUserPending
 } from "../modules/users";
-import type {History} from "history";
+import type { History } from "history";
 
 type Props = {
   user: User,
@@ -71,7 +76,19 @@ class DeleteUser extends React.Component<Props> {
     if (!this.isDeletable()) {
       return null;
     }
-    return <DeleteButton label={t("single-user.delete.button")} action={action} />;
+    return (
+      <>
+        <Subtitle subtitle={t("single-user.delete.subtitle")} />
+        <div className="columns">
+          <div className="column">
+            <DeleteButton
+              label={t("single-user.delete.button")}
+              action={action}
+            />
+          </div>
+        </div>
+      </>
+    );
   }
 }
 
diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index eb8aa904ff..0f6119ef94 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -11,7 +11,6 @@ import {
   validation as validator
 } from "@scm-manager/ui-components";
 import * as userValidator from "./userValidation";
-import DeleteUser from "./DeleteUser";
 
 type Props = {
   submitForm: User => void,
@@ -159,13 +158,6 @@ class UserForm extends React.Component<Props, State> {
             </div>
           </div>
         </form>
-        <hr />
-        <Subtitle subtitle={t("single-user.delete.subtitle")} />
-        <div className="columns">
-          <div className="column">
-            <DeleteUser user={user} />
-          </div>
-        </div>
       </>
     );
   }
diff --git a/scm-ui/src/users/containers/EditUser.js b/scm-ui/src/users/containers/EditUser.js
index 55062ecb5b..a8f3276471 100644
--- a/scm-ui/src/users/containers/EditUser.js
+++ b/scm-ui/src/users/containers/EditUser.js
@@ -3,6 +3,7 @@ import React from "react";
 import { connect } from "react-redux";
 import { withRouter } from "react-router-dom";
 import UserForm from "./../components/UserForm";
+import DeleteUser from "./../components/DeleteUser";
 import type { User } from "@scm-manager/ui-types";
 import {
   modifyUser,
@@ -49,6 +50,8 @@ class EditUser extends React.Component<Props> {
           user={user}
           loading={loading}
         />
+        <hr />
+        <DeleteUser user={user} />
       </div>
     );
   }
diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index 69c8a607e6..321e117976 100644
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -21,10 +21,7 @@ import {
   isFetchUserPending,
   getFetchUserFailure
 } from "../modules/users";
-import {
-  EditUserNavLink,
-  SetPasswordNavLink
-} from "./../components/navLinks";
+import { EditUserNavLink, SetPasswordNavLink } from "./../components/navLinks";
 import { translate } from "react-i18next";
 import { getUsersLink } from "../../modules/indexResource";
 import SetUserPassword from "../components/SetUserPassword";
@@ -105,7 +102,10 @@ class SingleUser extends React.Component<Props> {
                   to={`${url}/settings/general`}
                   label={t("single-user.menu.settingsNavLink")}
                 >
-                  <EditUserNavLink user={user} editUrl={`${url}/settings/general`} />
+                  <EditUserNavLink
+                    user={user}
+                    editUrl={`${url}/settings/general`}
+                  />
                   <SetPasswordNavLink
                     user={user}
                     passwordUrl={`${url}/settings/password`}
diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss
index 7ee8d427ba..3ceab48f9f 100644
--- a/scm-ui/styles/scm.scss
+++ b/scm-ui/styles/scm.scss
@@ -297,4 +297,7 @@ $fa-font-path: "webfonts";
   li:last-child {
     border-bottom: 1px solid #eee;
   }
+  div {
+    margin-bottom: 0;
+  }
 }