diff --git a/config/config.example.yml b/config/config.example.yml
index af04859201..500c2c476a 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -32,12 +32,60 @@ cache:
   # NOTE: how long should objects be cached for by default
   msToLive:
     default: 900000 # 15 minutes
-  control: max-age=60 # revalidate browser
+  # Default 'Cache-Control' HTTP Header to set for all static content (including compiled *.js files)
+  # Defaults to max-age=604,800 seconds (one week). This lets a user's browser know that it can cache these
+  # files for one week, after which they will be "stale" and need to be redownloaded.
+  # NOTE: When updates are made to compiled *.js files, it will automatically bypass this browser cache, because
+  # all compiled *.js files include a unique hash in their name which updates when content is modified.
+  control: max-age=604800 # revalidate browser
   autoSync:
     defaultTime: 0
     maxBufferSize: 100
     timePerMethod:
       PATCH: 3 # time in seconds
+  # In-memory cache(s) of server-side rendered pages. These caches will store the most recently accessed public pages.
+  # Pages are automatically added/dropped from these caches based on how recently they have been used.
+  # Restarting the app clears all page caches.
+  # NOTE: To control the cache size, use the "max" setting. Keep in mind, individual cached pages are usually small (<100KB).
+  # Enabling *both* caches will mean that a page may be cached twice, once in each cache (but may expire at different times via timeToLive).
+  serverSide:
+    # Set to true to see all cache hits/misses/refreshes in your console logs. Useful for debugging SSR caching issues.
+    debug: false
+    # When enabled (i.e. max > 0), known bots will be sent pages from a server side cache specific for bots.
+    # (Keep in mind, bot detection cannot be guarranteed. It is possible some bots will bypass this cache.)
+    botCache:
+      # Maximum number of pages to cache for known bots. Set to zero (0) to disable server side caching for bots.
+      # Default is 1000, which means the 1000 most recently accessed public pages will be cached.
+      # As all pages are cached in server memory, increasing this value will increase memory needs.
+      # Individual cached pages are usually small (<100KB), so max=1000 should only require ~100MB of memory.
+      max: 1000
+      # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
+      # copy is automatically refreshed on the next request.
+      # NOTE: For the bot cache, this setting may impact how quickly search engine bots will index new content on your site.
+      # For example, setting this to one week may mean that search engine bots may not find all new content for one week.
+      timeToLive: 86400000 # 1 day
+      # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page
+      # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive).
+      # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache).
+      # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR.
+      allowStale: true
+    # When enabled (i.e. max > 0), all anonymous users will be sent pages from a server side cache.
+    # This allows anonymous users to interact more quickly with the site, but also means they may see slightly
+    # outdated content (based on timeToLive)
+    anonymousCache:
+      # Maximum number of pages to cache. Default is zero (0) which means anonymous user cache is disabled.
+      # As all pages are cached in server memory, increasing this value will increase memory needs.
+      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory. 
+      max: 0
+      # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
+      # copy is automatically refreshed on the next request.
+      # NOTE: For the anonymous cache, it is recommended to keep this value low to avoid anonymous users seeing outdated content.
+      timeToLive: 10000 # 10 seconds
+      # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page
+      # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive).
+      # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache).
+      # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR.
+      allowStale: true
 
 # Authentication settings
 auth:
diff --git a/package.json b/package.json
index dcb629a331..184f1a5647 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,7 @@
     "fast-json-patch": "^3.0.0-1",
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^1.0.5",
+    "isbot": "^3.6.5",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.2",
@@ -106,6 +107,7 @@
     "jwt-decode": "^3.1.2",
     "klaro": "^0.7.18",
     "lodash": "^4.17.21",
+    "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
     "markdown-it-mathjax3": "^4.3.1",
     "mirador": "^3.3.0",
diff --git a/server.ts b/server.ts
index ecbbb982d4..3e10677a8b 100644
--- a/server.ts
+++ b/server.ts
@@ -28,6 +28,8 @@ import * as expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
 
 import axios from 'axios';
+import LRU from 'lru-cache';
+import isbot from 'isbot';
 import { createCertificate } from 'pem';
 import { createServer } from 'https';
 import { json } from 'body-parser';
@@ -35,7 +37,6 @@ import { json } from 'body-parser';
 import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 
-import { APP_BASE_HREF } from '@angular/common';
 import { enableProdMode } from '@angular/core';
 
 import { ngExpressEngine } from '@nguniversal/express-engine';
@@ -53,6 +54,8 @@ import { buildAppConfig } from './src/config/config.server';
 import { APP_CONFIG, AppConfig } from './src/config/app-config.interface';
 import { extendEnvironmentWithAppConfig } from './src/config/config.util';
 import { logStartupMessage } from './startup-message';
+import { TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
+
 
 /*
  * Set path for the browser application's dist folder
@@ -61,12 +64,18 @@ const DIST_FOLDER = join(process.cwd(), 'dist/browser');
 // Set path fir IIIF viewer.
 const IIIF_VIEWER = join(process.cwd(), 'dist/iiif');
 
-const indexHtml = existsSync(join(DIST_FOLDER, 'index.html')) ? 'index.html' : 'index';
+const indexHtml = join(DIST_FOLDER, 'index.html');
 
 const cookieParser = require('cookie-parser');
 
 const appConfig: AppConfig = buildAppConfig(join(DIST_FOLDER, 'assets/config.json'));
 
+// cache of SSR pages for known bots, only enabled in production mode
+let botCache: LRU<string, any>;
+
+// cache of SSR pages for anonymous users. Disabled by default, and only available in production mode
+let anonymousCache: LRU<string, any>;
+
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
@@ -87,10 +96,12 @@ export function app() {
   /*
    * If production mode is enabled in the environment file:
    * - Enable Angular's production mode
+   * - Initialize caching of SSR rendered pages (if enabled in config.yml)
    * - Enable compression for SSR reponses. See [compression](https://github.com/expressjs/compression)
    */
   if (environment.production) {
     enableProdMode();
+    initCache();
     server.use(compression({
       // only compress responses we've marked as SSR
       // otherwise, this middleware may compress files we've chosen not to compress via compression-webpack-plugin
@@ -106,13 +117,13 @@ export function app() {
 
   /*
    * Add cookie parser middleware
-   * See [morgan](https://github.com/expressjs/cookie-parser)
+   * See [cookie-parser](https://github.com/expressjs/cookie-parser)
    */
   server.use(cookieParser());
 
   /*
-   * Add parser for request bodies
-   * See [morgan](https://github.com/expressjs/body-parser)
+   * Add JSON parser for request bodies
+   * See [body-parser](https://github.com/expressjs/body-parser)
    */
   server.use(json());
 
@@ -186,7 +197,7 @@ export function app() {
    * Serve static resources (images, i18n messages, …)
    * Handle pre-compressed files with [express-static-gzip](https://github.com/tkoenig89/express-static-gzip)
    */
-  router.get('*.*', cacheControl, expressStaticGzip(DIST_FOLDER, {
+  router.get('*.*', addCacheControl, expressStaticGzip(DIST_FOLDER, {
     index: false,
     enableBrotli: true,
     orderPreference: ['br', 'gzip'],
@@ -202,8 +213,11 @@ export function app() {
    */
   server.get('/app/health', healthCheck);
 
-  // Register the ngApp callback function to handle incoming requests
-  router.get('*', ngApp);
+  /**
+   * Default sending all incoming requests to ngApp() function, after first checking for a cached
+   * copy of the page (see cacheCheck())
+   */
+  router.get('*', cacheCheck, ngApp);
 
   server.use(environment.ui.nameSpace, router);
 
@@ -215,60 +229,242 @@ export function app() {
  */
 function ngApp(req, res) {
   if (environment.universal.preboot) {
-    res.render(indexHtml, {
-      req,
-      res,
-      preboot: environment.universal.preboot,
-      async: environment.universal.async,
-      time: environment.universal.time,
-      baseUrl: environment.ui.nameSpace,
-      originUrl: environment.ui.baseUrl,
-      requestUrl: req.originalUrl,
-      providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }]
-    }, (err, data) => {
-      if (hasNoValue(err) && hasValue(data)) {
-        res.locals.ssr = true;  // mark response as SSR
-        res.send(data);
-      } else if (hasValue(err) && err.code === 'ERR_HTTP_HEADERS_SENT') {
-        // When this error occurs we can't fall back to CSR because the response has already been
-        // sent. These errors occur for various reasons in universal, not all of which are in our
-        // control to solve.
-        console.warn('Warning [ERR_HTTP_HEADERS_SENT]: Tried to set headers after they were sent to the client');
-      } else {
-        console.warn('Error in SSR, serving for direct CSR.');
-        if (hasValue(err)) {
-          console.warn('Error details : ', err);
-        }
-        res.render(indexHtml, {
-          req,
-          providers: [{
-            provide: APP_BASE_HREF,
-            useValue: req.baseUrl
-          }]
-        });
-      }
-    });
+    // Render the page to user via SSR (server side rendering)
+    serverSideRender(req, res);
   } else {
     // If preboot is disabled, just serve the client
-    console.log('Universal off, serving for direct CSR');
-    res.render(indexHtml, {
-      req,
-      providers: [{
-        provide: APP_BASE_HREF,
-        useValue: req.baseUrl
-      }]
+    console.log('Universal off, serving for direct client-side rendering (CSR)');
+    clientSideRender(req, res);
+  }
+}
+
+/**
+ * Render page content on server side using Angular SSR. By default this page content is
+ * returned to the user.
+ * @param req current request
+ * @param res current response
+ * @param sendToUser if true (default), send the rendered content to the user.
+ * If false, then only save this rendered content to the in-memory cache (to refresh cache).
+ */
+function serverSideRender(req, res, sendToUser: boolean = true) {
+  // Render the page via SSR (server side rendering)
+  res.render(indexHtml, {
+    req,
+    res,
+    preboot: environment.universal.preboot,
+    async: environment.universal.async,
+    time: environment.universal.time,
+    baseUrl: environment.ui.nameSpace,
+    originUrl: environment.ui.baseUrl,
+    requestUrl: req.originalUrl,
+  }, (err, data) => {
+    if (hasNoValue(err) && hasValue(data)) {
+      // save server side rendered page to cache (if any are enabled)
+      saveToCache(req, data);
+      if (sendToUser) {
+        res.locals.ssr = true;  // mark response as SSR (enables text compression)
+        // send rendered page to user
+        res.send(data);
+      }
+    } else if (hasValue(err) && err.code === 'ERR_HTTP_HEADERS_SENT') {
+      // When this error occurs we can't fall back to CSR because the response has already been
+      // sent. These errors occur for various reasons in universal, not all of which are in our
+      // control to solve.
+      console.warn('Warning [ERR_HTTP_HEADERS_SENT]: Tried to set headers after they were sent to the client');
+    } else {
+      console.warn('Error in server-side rendering (SSR)');
+      if (hasValue(err)) {
+        console.warn('Error details : ', err);
+      }
+      if (sendToUser) {
+        console.warn('Falling back to serving direct client-side rendering (CSR).');
+        clientSideRender(req, res);
+      }
+    }
+  });
+}
+
+/**
+ * Send back response to user to trigger direct client-side rendering (CSR)
+ * @param req current request
+ * @param res current response
+ */
+function clientSideRender(req, res) {
+  res.sendFile(indexHtml);
+}
+
+
+/*
+ * Adds a Cache-Control HTTP header to the response.
+ * The cache control value can be configured in the config.*.yml file
+ * Defaults to max-age=604,800 seconds (1 week)
+ */
+function addCacheControl(req, res, next) {
+  // instruct browser to revalidate
+  res.header('Cache-Control', environment.cache.control || 'max-age=604800');
+  next();
+}
+
+/*
+ * Initialize server-side caching of pages rendered via SSR.
+ */
+function initCache() {
+  if (botCacheEnabled()) {
+    // Initialize a new "least-recently-used" item cache (where least recently used pages are removed first)
+    // See https://www.npmjs.com/package/lru-cache
+    // When enabled, each page defaults to expiring after 1 day
+    botCache = new LRU( {
+      max: environment.cache.serverSide.botCache.max,
+      ttl: environment.cache.serverSide.botCache.timeToLive || 24 * 60 * 60 * 1000, // 1 day
+      allowStale: environment.cache.serverSide.botCache.allowStale ?? true // if object is stale, return stale value before deleting
+    });
+  }
+
+  if (anonymousCacheEnabled()) {
+    // NOTE: While caches may share SSR pages, this cache must be kept separately because the timeToLive
+    // may expire pages more frequently.
+    // When enabled, each page defaults to expiring after 10 seconds (to minimize anonymous users seeing out-of-date content)
+    anonymousCache = new LRU( {
+      max: environment.cache.serverSide.anonymousCache.max,
+      ttl: environment.cache.serverSide.anonymousCache.timeToLive || 10 * 1000, // 10 seconds
+      allowStale: environment.cache.serverSide.anonymousCache.allowStale ?? true // if object is stale, return stale value before deleting
     });
   }
 }
 
-/*
- * Adds a cache control header to the response
- * The cache control value can be configured in the environments file and defaults to max-age=60
+/**
+ * Return whether bot-specific server side caching is enabled in configuration.
  */
-function cacheControl(req, res, next) {
-  // instruct browser to revalidate
-  res.header('Cache-Control', environment.cache.control || 'max-age=60');
-  next();
+function botCacheEnabled(): boolean {
+  // Caching is only enabled if SSR is enabled AND
+  // "max" pages to cache is greater than zero
+  return environment.universal.preboot && environment.cache.serverSide.botCache.max && (environment.cache.serverSide.botCache.max > 0);
+}
+
+/**
+ * Return whether anonymous user server side caching is enabled in configuration.
+ */
+function anonymousCacheEnabled(): boolean {
+  // Caching is only enabled if SSR is enabled AND
+  // "max" pages to cache is greater than zero
+  return environment.universal.preboot && environment.cache.serverSide.anonymousCache.max && (environment.cache.serverSide.anonymousCache.max > 0);
+}
+
+/**
+ * Check if the currently requested page is in our server-side, in-memory cache.
+ * Caching is ONLY done for SSR requests. Pages are cached base on their path (e.g. /home or /search?query=test)
+ */
+function cacheCheck(req, res, next) {
+  // Cached copy of page (if found)
+  let cachedCopy;
+
+  // If the bot cache is enabled and this request looks like a bot, check the bot cache for a cached page.
+  if (botCacheEnabled() && isbot(req.get('user-agent'))) {
+    cachedCopy = checkCacheForRequest('bot', botCache, req, res);
+  } else if (anonymousCacheEnabled() && !isUserAuthenticated(req)) {
+    cachedCopy = checkCacheForRequest('anonymous', anonymousCache, req, res);
+  }
+
+  // If cached copy exists, return it to the user.
+  if (cachedCopy) {
+    res.locals.ssr = true;  // mark response as SSR-generated (enables text compression)
+    res.send(cachedCopy);
+
+    // Tell Express to skip all other handlers for this path
+    // This ensures we don't try to re-render the page since we've already returned the cached copy
+    next('router');
+  } else {
+    // If nothing found in cache, just continue with next handler
+    // (This should send the request on to the handler that rerenders the page via SSR
+    next();
+  }
+}
+
+/**
+ * Checks if the current request (i.e. page) is found in the given cache. If it is found,
+ * the cached copy is returned. When found, this method also triggers a re-render via
+ * SSR if the cached copy is now expired (i.e. timeToLive has passed for this cached copy).
+ * @param cacheName name of cache (just useful for debug logging)
+ * @param cache LRU cache to check
+ * @param req current request to look for in the cache
+ * @param res current response
+ * @returns cached copy (if found) or undefined (if not found)
+ */
+function checkCacheForRequest(cacheName: string, cache: LRU<string, any>, req, res): any {
+  // Get the cache key for this request
+  const key = getCacheKey(req);
+
+  // Check if this page is in our cache
+  let cachedCopy = cache.get(key);
+  if (cachedCopy) {
+    if (environment.cache.serverSide.debug) { console.log(`CACHE HIT FOR ${key} in ${cacheName} cache`); }
+
+    // Check if cached copy is expired (If expired, the key will now be gone from cache)
+    // NOTE: This will only occur when "allowStale=true", as it means the "get(key)" above returned a stale value.
+    if (!cache.has(key)) {
+      if (environment.cache.serverSide.debug) { console.log(`CACHE EXPIRED FOR ${key} in ${cacheName} cache. Re-rendering...`); }
+      // Update cached copy by rerendering server-side
+      // NOTE: In this scenario the currently cached copy will be returned to the current user.
+      // This re-render is peformed behind the scenes to update cached copy for next user.
+      serverSideRender(req, res, false);
+    }
+  } else {
+    if (environment.cache.serverSide.debug) { console.log(`CACHE MISS FOR ${key} in ${cacheName} cache.`); }
+  }
+
+  // return page from cache
+  return cachedCopy;
+}
+
+/**
+ * Create a cache key from the current request.
+ * The cache key is the URL path (NOTE: this key will also include any querystring params).
+ * E.g. "/home" or "/search?query=test"
+ * @param req current request
+ * @returns cache key to use for this page
+ */
+function getCacheKey(req): string {
+  // NOTE: this will return the URL path *without* any baseUrl
+  return req.url;
+}
+
+/**
+ * Save page to server side cache(s), if enabled. If caching is not enabled or a user is authenticated, this is a noop
+ * If multiple caches are enabled, the page will be saved to any caches where it does not yet exist (or is expired).
+ * (This minimizes the number of times we need to run SSR on the same page.)
+ * @param req current page request
+ * @param page page data to save to cache
+ */
+function saveToCache(req, page: any) {
+  // Only cache if no one is currently authenticated. This means ONLY public pages can be cached.
+  // NOTE: It's not safe to save page data to the cache when a user is authenticated. In that situation,
+  // the page may include sensitive or user-specific materials. As the cache is shared across all users, it can only contain public info.
+  if (!isUserAuthenticated(req)) {
+    const key = getCacheKey(req);
+    // Avoid caching "/reload/[random]" paths (these are hard refreshes after logout)
+    if (key.startsWith('/reload')) { return; }
+
+    // If bot cache is enabled, save it to that cache if it doesn't exist or is expired
+    // (NOTE: has() will return false if page is expired in cache)
+    if (botCacheEnabled() && !botCache.has(key)) {
+      botCache.set(key, page);
+      if (environment.cache.serverSide.debug) { console.log(`CACHE SAVE FOR ${key} in bot cache.`); }
+    }
+
+    // If anonymous cache is enabled, save it to that cache if it doesn't exist or is expired
+    if (anonymousCacheEnabled() && !anonymousCache.has(key)) {
+      anonymousCache.set(key, page);
+      if (environment.cache.serverSide.debug) { console.log(`CACHE SAVE FOR ${key} in anonymous cache.`); }
+    }
+  }
+}
+
+/**
+ * Whether a user is authenticated or not
+ */
+function isUserAuthenticated(req): boolean {
+  // Check whether our DSpace authentication Cookie exists or not
+  return req.cookies[TOKENITEM];
 }
 
 /*
diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index 1ea20bc9a0..8e4f13b164 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -47,6 +47,12 @@ import { BatchImportPageComponent } from './admin-import-batch-page/batch-import
         component: BatchImportPageComponent,
         data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' }
       },
+      {
+        path: 'system-wide-alert',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        loadChildren: () => import('../system-wide-alert/system-wide-alert.module').then((m) => m.SystemWideAlertModule),
+        data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'}
+      },
     ])
   ],
   providers: [
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index 8706b40ee0..7f1e8716ba 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -1,7 +1,7 @@
 <div class="sidebar-section">
     <a class="nav-item nav-link d-flex flex-row flex-nowrap"
-       [ngClass]="{ disabled: !hasLink }"
-       [attr.aria-disabled]="!hasLink"
+       [ngClass]="{ disabled: isDisabled }"
+       [attr.aria-disabled]="isDisabled"
        [attr.aria-labelledby]="'sidebarName-' + section.id"
        [title]="('menu.section.icon.' + section.id) | translate"
        [routerLink]="itemModel.link"
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
index 1e28b62626..260a364d7a 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
@@ -17,38 +17,86 @@ describe('AdminSidebarSectionComponent', () => {
   const menuService = new MenuServiceStub();
   const iconString = 'test';
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()],
-      declarations: [AdminSidebarSectionComponent, TestComponent],
-      providers: [
-        { provide: 'sectionDataProvider', useValue: { model: { link: 'google.com' }, icon: iconString } },
-        { provide: MenuService, useValue: menuService },
-        { provide: CSSVariableService, useClass: CSSVariableServiceStub },
-      ]
-    }).overrideComponent(AdminSidebarSectionComponent, {
-      set: {
-        entryComponents: [TestComponent]
-      }
-    })
-      .compileComponents();
-  }));
+  describe('when not disabled', () => {
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AdminSidebarSectionComponent);
-    component = fixture.componentInstance;
-    spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
-    fixture.detectChanges();
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()],
+        declarations: [AdminSidebarSectionComponent, TestComponent],
+        providers: [
+          {provide: 'sectionDataProvider', useValue: {model: {link: 'google.com'}, icon: iconString}},
+          {provide: MenuService, useValue: menuService},
+          {provide: CSSVariableService, useClass: CSSVariableServiceStub},
+        ]
+      }).overrideComponent(AdminSidebarSectionComponent, {
+        set: {
+          entryComponents: [TestComponent]
+        }
+      })
+        .compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(AdminSidebarSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should set the right icon', () => {
+      const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
+      expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
+    });
+    it('should not contain the disabled class', () => {
+      const disabled = fixture.debugElement.query(By.css('.disabled'));
+      expect(disabled).toBeFalsy();
+    });
+
+  });
+  describe('when disabled', () => {
+
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()],
+        declarations: [AdminSidebarSectionComponent, TestComponent],
+        providers: [
+          {provide: 'sectionDataProvider', useValue: {model: {link: 'google.com', disabled: true}, icon: iconString}},
+          {provide: MenuService, useValue: menuService},
+          {provide: CSSVariableService, useClass: CSSVariableServiceStub},
+        ]
+      }).overrideComponent(AdminSidebarSectionComponent, {
+        set: {
+          entryComponents: [TestComponent]
+        }
+      })
+        .compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(AdminSidebarSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should set the right icon', () => {
+      const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
+      expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
+    });
+    it('should contain the disabled class', () => {
+      const disabled = fixture.debugElement.query(By.css('.disabled'));
+      expect(disabled).toBeTruthy();
+    });
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('should set the right icon', () => {
-    const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
-    expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
-  });
 });
 
 // declare a test component
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
index 47f693cb99..d6cd803622 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -5,7 +5,7 @@ import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorat
 import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model';
 import { MenuSection } from '../../../shared/menu/menu-section.model';
 import { MenuID } from '../../../shared/menu/menu-id.model';
-import { isNotEmpty } from '../../../shared/empty.util';
+import { isEmpty } from '../../../shared/empty.util';
 import { Router } from '@angular/router';
 
 /**
@@ -26,7 +26,12 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
    */
   menuID: MenuID = MenuID.ADMIN;
   itemModel;
-  hasLink: boolean;
+
+  /**
+   * Boolean to indicate whether this section is disabled
+   */
+  isDisabled: boolean;
+
   constructor(
     @Inject('sectionDataProvider') menuSection: MenuSection,
     protected menuService: MenuService,
@@ -38,13 +43,13 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
   }
 
   ngOnInit(): void {
-    this.hasLink = isNotEmpty(this.itemModel?.link);
+    this.isDisabled = this.itemModel?.disabled || isEmpty(this.itemModel?.link);
     super.ngOnInit();
   }
 
   navigate(event: any): void {
     event.preventDefault();
-    if (this.hasLink) {
+    if (!this.isDisabled) {
       this.router.navigate(this.itemModel.link);
     }
   }
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 734c3d2ef9..1f4666bbd0 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -7,6 +7,7 @@
      [attr.aria-labelledby]="'sidebarName-' + section.id"
      [attr.aria-expanded]="expanded | async"
      [title]="('menu.section.icon.' + section.id) | translate"
+       [class.disabled]="section.model?.disabled"
      (click)="toggleSection($event)"
      (keyup.space)="toggleSection($event)"
      (keyup.enter)="toggleSection($event)"
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
index 0f0181c3d5..dd31f757c2 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
@@ -23,7 +23,7 @@ describe('ExpandableAdminSidebarSectionComponent', () => {
       imports: [NoopAnimationsModule, TranslateModule.forRoot()],
       declarations: [ExpandableAdminSidebarSectionComponent, TestComponent],
       providers: [
-        { provide: 'sectionDataProvider', useValue: { icon: iconString } },
+        { provide: 'sectionDataProvider', useValue: { icon: iconString, model: {} } },
         { provide: MenuService, useValue: menuService },
         { provide: CSSVariableService, useClass: CSSVariableServiceStub },
         { provide: Router, useValue: new RouterStub() },
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
index b68f498771..a9b37f1757 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -1,7 +1,9 @@
 <div class="container">
     <ng-container *ngVar="(parent$ | async) as parent">
     <ng-container *ngIf="parent?.payload as parentContext">
-    <header class="comcol-header border-bottom mb-4 pb-4">
+        <div class="d-flex flex-row border-bottom mb-4 pb-4">
+
+            <header class="comcol-header mr-auto">
         <!-- Parent Name -->
         <ds-comcol-page-header [name]="parentContext.name">
         </ds-comcol-page-header>
@@ -22,6 +24,8 @@
         <ds-comcol-page-content [content]="parentContext.sidebarText" [hasInnerHtml]="true" [title]="'community.page.news'">
         </ds-comcol-page-content>
       </header>
+        <ds-dso-edit-menu></ds-dso-edit-menu>
+        </div>
       <!-- Browse-By Links -->
       <ds-themed-comcol-page-browse-by [id]="parentContext.id" [contentType]="parentContext.type"></ds-themed-comcol-page-browse-by>
       </ng-container></ng-container>
diff --git a/src/app/browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts
index 5788d3cc70..bb67dc65ae 100644
--- a/src/app/browse-by/browse-by-routing.module.ts
+++ b/src/app/browse-by/browse-by-routing.module.ts
@@ -4,13 +4,17 @@ import { BrowseByGuard } from './browse-by-guard';
 import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
 import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
 import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
+import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
         path: '',
-        resolve: { breadcrumb: BrowseByDSOBreadcrumbResolver },
+        resolve: {
+          breadcrumb: BrowseByDSOBreadcrumbResolver,
+          menu: DSOEditMenuResolver
+        },
         children: [
           {
             path: ':id',
diff --git a/src/app/browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts
index a7643464dc..6c652376d5 100644
--- a/src/app/browse-by/browse-by.module.ts
+++ b/src/app/browse-by/browse-by.module.ts
@@ -10,6 +10,7 @@ import { ThemedBrowseByMetadataPageComponent } from './browse-by-metadata-page/t
 import { ThemedBrowseByDatePageComponent } from './browse-by-date-page/themed-browse-by-date-page.component';
 import { ThemedBrowseByTitlePageComponent } from './browse-by-title-page/themed-browse-by-title-page.component';
 import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -28,6 +29,7 @@ const ENTRY_COMPONENTS = [
     SharedBrowseByModule,
     CommonModule,
     ComcolModule,
+    DsoPageModule
   ],
   declarations: [
     BrowseBySwitcherComponent,
diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts
index 819ee8ca16..9dc25b778e 100644
--- a/src/app/collection-page/collection-page-routing.module.ts
+++ b/src/app/collection-page/collection-page-routing.module.ts
@@ -21,6 +21,7 @@ import { CollectionPageAdministratorGuard } from './collection-page-administrato
 import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
 import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 
 @NgModule({
   imports: [
@@ -34,7 +35,8 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
         path: ':id',
         resolve: {
           dso: CollectionPageResolver,
-          breadcrumb: CollectionBreadcrumbResolver
+          breadcrumb: CollectionBreadcrumbResolver,
+          menu: DSOEditMenuResolver
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -91,7 +93,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
     DSOBreadcrumbsService,
     LinkService,
     CreateCollectionPageGuard,
-    CollectionPageAdministratorGuard
+    CollectionPageAdministratorGuard,
   ]
 })
 export class CollectionPageRoutingModule {
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index eebfdbd829..0376b5ddbc 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -33,9 +33,7 @@
                           [title]="'collection.page.news'">
                   </ds-comcol-page-content>
                 </header>
-                <div class="pl-2 space-children-mr">
-                  <ds-dso-page-edit-button *ngIf="isCollectionAdmin$ | async"  [pageRoute]="collectionPageRoute$ | async" [dso]="collection" [tooltipMsg]="'collection.page.edit'"></ds-dso-page-edit-button>
-                </div>
+                  <ds-dso-edit-menu></ds-dso-edit-menu>
               </div>
               <section class="comcol-page-browse-section">
               <!-- Browse-By Links -->
diff --git a/src/app/collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts
index c46aad48a8..6bcefed2b7 100644
--- a/src/app/collection-page/collection-page.module.ts
+++ b/src/app/collection-page/collection-page.module.ts
@@ -17,6 +17,7 @@ import { CollectionFormModule } from './collection-form/collection-form.module';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
 import { ComcolModule } from '../shared/comcol/comcol.module';
 import { DsoSharedModule } from '../dso-shared/dso-shared.module';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 
 @NgModule({
   imports: [
@@ -28,6 +29,7 @@ import { DsoSharedModule } from '../dso-shared/dso-shared.module';
     CollectionFormModule,
     ComcolModule,
     DsoSharedModule,
+    DsoPageModule,
   ],
   declarations: [
     CollectionPageComponent,
diff --git a/src/app/community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts
index 4870d52dd9..c37f8832f8 100644
--- a/src/app/community-page/community-page-routing.module.ts
+++ b/src/app/community-page/community-page-routing.module.ts
@@ -14,6 +14,7 @@ import { CommunityPageAdministratorGuard } from './community-page-administrator.
 import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 import { ThemedCommunityPageComponent } from './themed-community-page.component';
 import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 
 @NgModule({
   imports: [
@@ -27,7 +28,8 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
         path: ':id',
         resolve: {
           dso: CommunityPageResolver,
-          breadcrumb: CommunityBreadcrumbResolver
+          breadcrumb: CommunityBreadcrumbResolver,
+          menu: DSOEditMenuResolver
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -73,7 +75,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
     DSOBreadcrumbsService,
     LinkService,
     CreateCommunityPageGuard,
-    CommunityPageAdministratorGuard
+    CommunityPageAdministratorGuard,
   ]
 })
 export class CommunityPageRoutingModule {
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index 368fec08a5..058ab4c1c1 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -20,9 +20,7 @@
             [title]="'community.page.news'">
           </ds-comcol-page-content>
         </header>
-        <div class="pl-2 space-children-mr">
-          <ds-dso-page-edit-button *ngIf="isCommunityAdmin$ | async" [pageRoute]="communityPageRoute$ | async" [dso]="communityPayload" [tooltipMsg]="'community.page.edit'"></ds-dso-page-edit-button>
-        </div>
+        <ds-dso-edit-menu></ds-dso-edit-menu>
       </div>
       <section class="comcol-page-browse-section">
 
diff --git a/src/app/community-page/community-page.module.ts b/src/app/community-page/community-page.module.ts
index 1dd9e82499..45ffb2a786 100644
--- a/src/app/community-page/community-page.module.ts
+++ b/src/app/community-page/community-page.module.ts
@@ -19,6 +19,7 @@ import {
 import {
   ThemedCollectionPageSubCollectionListComponent
 } from './sub-collection-list/themed-community-page-sub-collection-list.component';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 
 const DECLARATIONS = [CommunityPageComponent,
   ThemedCommunityPageComponent,
@@ -37,6 +38,7 @@ const DECLARATIONS = [CommunityPageComponent,
     StatisticsModule.forRoot(),
     CommunityFormModule,
     ComcolModule,
+    DsoPageModule,
   ],
   declarations: [
     ...DECLARATIONS
diff --git a/src/app/core/auth/auth-request.service.spec.ts b/src/app/core/auth/auth-request.service.spec.ts
index 704922c5b5..063aad612f 100644
--- a/src/app/core/auth/auth-request.service.spec.ts
+++ b/src/app/core/auth/auth-request.service.spec.ts
@@ -11,6 +11,7 @@ import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import objectContaining = jasmine.objectContaining;
 import { AuthStatus } from './models/auth-status.model';
 import { RestRequestMethod } from '../data/rest-request-method';
+import { Observable, of as observableOf } from 'rxjs';
 
 describe(`AuthRequestService`, () => {
   let halService: HALEndpointService;
@@ -34,8 +35,8 @@ describe(`AuthRequestService`, () => {
       super(hes, rs, rdbs);
     }
 
-    protected createShortLivedTokenRequest(href: string): PostRequest {
-      return new PostRequest(this.requestService.generateRequestId(), href);
+    protected createShortLivedTokenRequest(href: string): Observable<PostRequest> {
+      return observableOf(new PostRequest(this.requestService.generateRequestId(), href));
     }
   }
 
diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 5c0c3340c7..7c1f17dec2 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -100,14 +100,12 @@ export abstract class AuthRequestService {
     );
   }
   /**
-   * Factory function to create the request object to send. This needs to be a POST client side and
-   * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow
-   * only the server IP to send a GET to this endpoint.
+   * Factory function to create the request object to send.
    *
    * @param href The href to send the request to
    * @protected
    */
-  protected abstract createShortLivedTokenRequest(href: string): GetRequest | PostRequest;
+  protected abstract createShortLivedTokenRequest(href: string): Observable<PostRequest>;
 
   /**
    * Send a request to retrieve a short-lived token which provides download access of restricted files
@@ -117,7 +115,7 @@ export abstract class AuthRequestService {
       filter((href: string) => isNotEmpty(href)),
       distinctUntilChanged(),
       map((href: string) => new URLCombiner(href, this.shortlivedtokensEndpoint).toString()),
-      map((endpointURL: string) => this.createShortLivedTokenRequest(endpointURL)),
+      switchMap((endpointURL: string) => this.createShortLivedTokenRequest(endpointURL)),
       tap((request: RestRequest) => this.requestService.send(request)),
       switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID<ShortLivedToken>(request.uuid)),
       getFirstCompletedRemoteData(),
diff --git a/src/app/core/auth/browser-auth-request.service.spec.ts b/src/app/core/auth/browser-auth-request.service.spec.ts
index 18d27340af..b41d981bcf 100644
--- a/src/app/core/auth/browser-auth-request.service.spec.ts
+++ b/src/app/core/auth/browser-auth-request.service.spec.ts
@@ -1,6 +1,8 @@
 import { AuthRequestService } from './auth-request.service';
 import { RequestService } from '../data/request.service';
 import { BrowserAuthRequestService } from './browser-auth-request.service';
+import { Observable } from 'rxjs';
+import { PostRequest } from '../data/request.models';
 
 describe(`BrowserAuthRequestService`, () => {
   let href: string;
@@ -16,14 +18,20 @@ describe(`BrowserAuthRequestService`, () => {
   });
 
   describe(`createShortLivedTokenRequest`, () => {
-    it(`should return a PostRequest`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.constructor.name).toBe('PostRequest');
+    it(`should return a PostRequest`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.constructor.name).toBe('PostRequest');
+        done();
+      });
     });
 
-    it(`should return a request with the given href`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.href).toBe(href) ;
+    it(`should return a request with the given href`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.href).toBe(href);
+        done();
+      });
     });
   });
 });
diff --git a/src/app/core/auth/browser-auth-request.service.ts b/src/app/core/auth/browser-auth-request.service.ts
index 85d5f54340..485e2ef9c4 100644
--- a/src/app/core/auth/browser-auth-request.service.ts
+++ b/src/app/core/auth/browser-auth-request.service.ts
@@ -4,6 +4,7 @@ import { PostRequest } from '../data/request.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Observable, of as observableOf } from 'rxjs';
 
 /**
  * Client side version of the service to send authentication requests
@@ -20,15 +21,13 @@ export class BrowserAuthRequestService extends AuthRequestService {
   }
 
   /**
-   * Factory function to create the request object to send. This needs to be a POST client side and
-   * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow
-   * only the server IP to send a GET to this endpoint.
+   * Factory function to create the request object to send.
    *
    * @param href The href to send the request to
    * @protected
    */
-  protected createShortLivedTokenRequest(href: string): PostRequest {
-    return new PostRequest(this.requestService.generateRequestId(), href);
+  protected createShortLivedTokenRequest(href: string): Observable<PostRequest> {
+    return observableOf(new PostRequest(this.requestService.generateRequestId(), href));
   }
 
 }
diff --git a/src/app/core/auth/server-auth-request.service.spec.ts b/src/app/core/auth/server-auth-request.service.spec.ts
index 69053fbb3a..df6d78256b 100644
--- a/src/app/core/auth/server-auth-request.service.spec.ts
+++ b/src/app/core/auth/server-auth-request.service.spec.ts
@@ -1,34 +1,68 @@
 import { AuthRequestService } from './auth-request.service';
 import { RequestService } from '../data/request.service';
 import { ServerAuthRequestService } from './server-auth-request.service';
+import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
+import { Observable, of as observableOf } from 'rxjs';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { PostRequest } from '../data/request.models';
+import {
+  XSRF_REQUEST_HEADER,
+  XSRF_RESPONSE_HEADER
+} from '../xsrf/xsrf.interceptor';
 
 describe(`ServerAuthRequestService`, () => {
   let href: string;
   let requestService: RequestService;
   let service: AuthRequestService;
+  let httpClient: HttpClient;
+  let httpResponse: HttpResponse<any>;
+  let halService: HALEndpointService;
+  const mockToken = 'mock-token';
 
   beforeEach(() => {
     href = 'https://rest.api/auth/shortlivedtokens';
     requestService = jasmine.createSpyObj('requestService', {
       'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2'
     });
-    service = new ServerAuthRequestService(null, requestService, null);
+    let headers = new HttpHeaders();
+    headers = headers.set(XSRF_RESPONSE_HEADER, mockToken);
+    httpResponse = {
+      body: { bar: false },
+      headers: headers,
+      statusText: '200'
+    } as HttpResponse<any>;
+    httpClient = jasmine.createSpyObj('httpClient', {
+      get: observableOf(httpResponse),
+    });
+    halService = jasmine.createSpyObj('halService', {
+      'getRootHref': '/api'
+    });
+    service = new ServerAuthRequestService(halService, requestService, null, httpClient);
   });
 
   describe(`createShortLivedTokenRequest`, () => {
-    it(`should return a GetRequest`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.constructor.name).toBe('GetRequest');
+    it(`should return a PostRequest`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.constructor.name).toBe('PostRequest');
+        done();
+      });
     });
 
-    it(`should return a request with the given href`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.href).toBe(href) ;
+    it(`should return a request with the given href`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.href).toBe(href);
+        done();
+      });
     });
 
-    it(`should have a responseMsToLive of 2 seconds`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.responseMsToLive).toBe(2 * 1000) ;
+    it(`should return a request with a xsrf header`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.options.headers.get(XSRF_REQUEST_HEADER)).toBe(mockToken);
+        done();
+      });
     });
   });
 });
diff --git a/src/app/core/auth/server-auth-request.service.ts b/src/app/core/auth/server-auth-request.service.ts
index 751389f71d..d6302081bc 100644
--- a/src/app/core/auth/server-auth-request.service.ts
+++ b/src/app/core/auth/server-auth-request.service.ts
@@ -1,9 +1,21 @@
 import { Injectable } from '@angular/core';
 import { AuthRequestService } from './auth-request.service';
-import { GetRequest } from '../data/request.models';
+import { PostRequest } from '../data/request.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import {
+  HttpHeaders,
+  HttpClient,
+  HttpResponse
+} from '@angular/common/http';
+import {
+  XSRF_REQUEST_HEADER,
+  XSRF_RESPONSE_HEADER,
+  DSPACE_XSRF_COOKIE
+} from '../xsrf/xsrf.interceptor';
+import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 
 /**
  * Server side version of the service to send authentication requests
@@ -14,23 +26,42 @@ export class ServerAuthRequestService extends AuthRequestService {
   constructor(
     halService: HALEndpointService,
     requestService: RequestService,
-    rdbService: RemoteDataBuildService
+    rdbService: RemoteDataBuildService,
+    protected httpClient: HttpClient,
   ) {
     super(halService, requestService, rdbService);
   }
 
   /**
-   * Factory function to create the request object to send. This needs to be a POST client side and
-   * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow
-   * only the server IP to send a GET to this endpoint.
+   * Factory function to create the request object to send.
    *
    * @param href The href to send the request to
    * @protected
    */
-  protected createShortLivedTokenRequest(href: string): GetRequest {
-    return Object.assign(new GetRequest(this.requestService.generateRequestId(), href), {
-      responseMsToLive: 2 * 1000 // A short lived token is only valid for 2 seconds.
-    });
+  protected createShortLivedTokenRequest(href: string): Observable<PostRequest> {
+    // First do a call to the root endpoint in order to get an XSRF token
+    return this.httpClient.get(this.halService.getRootHref(), { observe: 'response' }).pipe(
+      // retrieve the XSRF token from the response header
+      map((response: HttpResponse<any>) => response.headers.get(XSRF_RESPONSE_HEADER)),
+      // Use that token to create an HttpHeaders object
+      map((xsrfToken: string) => new HttpHeaders()
+          .set('Content-Type', 'application/json; charset=utf-8')
+          // set the token as the XSRF header
+          .set(XSRF_REQUEST_HEADER, xsrfToken)
+          // and as the DSPACE-XSRF-COOKIE
+          .set('Cookie', `${DSPACE_XSRF_COOKIE}=${xsrfToken}`)),
+      map((headers: HttpHeaders) =>
+        // Create a new PostRequest using those headers and the given href
+        new PostRequest(
+          this.requestService.generateRequestId(),
+          href,
+          {},
+          {
+            headers: headers,
+          },
+        )
+      )
+    );
   }
 
 }
diff --git a/src/app/core/browse/browse-definition-data.service.spec.ts b/src/app/core/browse/browse-definition-data.service.spec.ts
index 9377dc715f..f321c2551c 100644
--- a/src/app/core/browse/browse-definition-data.service.spec.ts
+++ b/src/app/core/browse/browse-definition-data.service.spec.ts
@@ -2,27 +2,66 @@ import { BrowseDefinitionDataService } from './browse-definition-data.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { EMPTY } from 'rxjs';
 import { FindListOptions } from '../data/find-list-options.model';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { RequestService } from '../data/request.service';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
 
 describe(`BrowseDefinitionDataService`, () => {
+  let requestService: RequestService;
   let service: BrowseDefinitionDataService;
-  const findAllDataSpy = jasmine.createSpyObj('findAllData', {
-    findAll: EMPTY,
-  });
+  let findAllDataSpy;
+  let searchDataSpy;
+  const browsesEndpointURL = 'https://rest.api/browses';
+  const halService: any = new HALEndpointServiceStub(browsesEndpointURL);
+
   const options = new FindListOptions();
   const linksToFollow = [
     followLink('entries'),
     followLink('items')
   ];
 
+  function initTestService() {
+    return new BrowseDefinitionDataService(
+      requestService,
+      getMockRemoteDataBuildService(),
+      getMockObjectCacheService(),
+      halService,
+    );
+  }
+
   beforeEach(() => {
-    service = new BrowseDefinitionDataService(null, null, null, null);
+    service = initTestService();
+    findAllDataSpy = jasmine.createSpyObj('findAllData', {
+      findAll: EMPTY,
+    });
+    searchDataSpy = jasmine.createSpyObj('searchData', {
+      searchBy: EMPTY,
+      getSearchByHref: EMPTY,
+    });
     (service as any).findAllData = findAllDataSpy;
+    (service as any).searchData = searchDataSpy;
   });
 
+  describe('findByFields', () => {
+    it(`should call searchByHref on searchData`, () => {
+      service.findByFields(['test'], true, false, ...linksToFollow);
+      expect(searchDataSpy.getSearchByHref).toHaveBeenCalled();
+    });
+  });
+  describe('searchBy', () => {
+    it(`should call searchBy on searchData`, () => {
+      service.searchBy('test', options, true, false, ...linksToFollow);
+      expect(searchDataSpy.searchBy).toHaveBeenCalledWith('test', options, true, false, ...linksToFollow);
+    });
+  });
   describe(`findAll`, () => {
     it(`should call findAll on findAllData`, () => {
       service.findAll(options, true, false, ...linksToFollow);
       expect(findAllDataSpy.findAll).toHaveBeenCalledWith(options, true, false, ...linksToFollow);
     });
   });
+
+
+
 });
diff --git a/src/app/core/browse/browse-definition-data.service.ts b/src/app/core/browse/browse-definition-data.service.ts
index 32c3b44e14..88d070000e 100644
--- a/src/app/core/browse/browse-definition-data.service.ts
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -13,6 +13,8 @@ import { FindListOptions } from '../data/find-list-options.model';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 import { FindAllData, FindAllDataImpl } from '../data/base/find-all-data';
 import { dataService } from '../data/base/data-service.decorator';
+import { RequestParam } from '../cache/models/request-param.model';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
 
 /**
  * Data service responsible for retrieving browse definitions from the REST server
@@ -21,8 +23,9 @@ import { dataService } from '../data/base/data-service.decorator';
   providedIn: 'root',
 })
 @dataService(BROWSE_DEFINITION)
-export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseDefinition> implements FindAllData<BrowseDefinition> {
+export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseDefinition> implements FindAllData<BrowseDefinition>, SearchData<BrowseDefinition> {
   private findAllData: FindAllDataImpl<BrowseDefinition>;
+  private searchData: SearchDataImpl<BrowseDefinition>;
 
   constructor(
     protected requestService: RequestService,
@@ -31,7 +34,7 @@ export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseD
     protected halService: HALEndpointService,
   ) {
     super('browses', requestService, rdbService, objectCache, halService);
-
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
     this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
@@ -52,5 +55,71 @@ export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseD
   findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
     return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>}
+   *    Return an observable that emits response from the server
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Create the HREF for a specific object's search method with given options object
+   *
+   * @param searchMethod The search method for the object
+   * @param options The [[FindListOptions]] object
+   * @return {Observable<string>}
+   *    Return an observable that emits created HREF
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  public getSearchByHref(searchMethod: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * Get the browse URL by providing a list of metadata keys. The first matching browse index definition
+   * for any of the fields is returned. This is used in eg. item page field component, which can be configured
+   * with several fields for a component like 'Author', and needs to know if and how to link the values
+   * to configured browse indices.
+   *
+   * @param fields  an array of field strings, eg. ['dc.contributor.author', 'dc.creator']
+   * @param useCachedVersionIfAvailable Override the data service useCachedVersionIfAvailable parameter (default: true)
+   * @param reRequestOnStale Override the data service reRequestOnStale parameter (default: true)
+   * @param linksToFollow Override the data service linksToFollow parameter (default: empty array)
+   */
+  findByFields(
+    fields: string[],
+    useCachedVersionIfAvailable = true,
+    reRequestOnStale = true,
+    ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]
+  ): Observable<RemoteData<BrowseDefinition>> {
+    const searchParams = [];
+    searchParams.push(new RequestParam('fields', fields));
+
+    const hrefObs = this.getSearchByHref(
+      'byFields',
+      { searchParams },
+      ...linksToFollow
+    );
+
+    return this.findByHref(
+      hrefObs,
+      useCachedVersionIfAvailable,
+      reRequestOnStale,
+      ...linksToFollow,
+    );
+  }
+
 }
 
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 2fab189254..be28015069 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -19,9 +19,9 @@ import {
 } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
-import { BrowseDefinitionDataService } from './browse-definition-data.service';
 import { HrefOnlyDataService } from '../data/href-only-data.service';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { BrowseDefinitionDataService } from './browse-definition-data.service';
 
 
 export const BROWSE_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry | Item>[] = [
@@ -35,7 +35,7 @@ export const BROWSE_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry | Item>[] = [
 export class BrowseService {
   protected linkPath = 'browses';
 
-  private static toSearchKeyArray(metadataKey: string): string[] {
+  public static toSearchKeyArray(metadataKey: string): string[] {
     const keyParts = metadataKey.split('.');
     const searchFor = [];
     searchFor.push('*');
diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts
index cd14a527e8..b569df290d 100644
--- a/src/app/core/core.effects.ts
+++ b/src/app/core/core.effects.ts
@@ -7,7 +7,6 @@ import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
 import { ObjectUpdatesEffects } from './data/object-updates/object-updates.effects';
 import { RouteEffects } from './services/route.effects';
 import { RouterEffects } from './router/router.effects';
-import { MenuEffects } from '../shared/menu/menu.effects';
 
 export const coreEffects = [
   RequestEffects,
@@ -19,5 +18,4 @@ export const coreEffects = [
   ObjectUpdatesEffects,
   RouteEffects,
   RouterEffects,
-  MenuEffects
 ];
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 845bab2ea8..0aed8c0578 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -170,6 +170,7 @@ import { OrcidHistory } from './orcid/model/orcid-history.model';
 import { OrcidAuthService } from './orcid/orcid-auth.service';
 import { VocabularyDataService } from './submission/vocabularies/vocabulary.data.service';
 import { VocabularyEntryDetailsDataService } from './submission/vocabularies/vocabulary-entry-details.data.service';
+import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model';
 import { SupervisionOrderDataService } from './supervision-order/supervision-order-data.service';
 
 /**
@@ -358,7 +359,8 @@ export const models =
     ResearcherProfile,
     OrcidQueue,
     OrcidHistory,
-    AccessStatusObject
+    AccessStatusObject,
+    IdentifierData,
   ];
 
 @NgModule({
diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts
index bfbecdaecb..499d05af38 100644
--- a/src/app/core/data/eperson-registration.service.ts
+++ b/src/app/core/data/eperson-registration.service.ts
@@ -14,6 +14,7 @@ import { RemoteData } from './remote-data';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HttpHeaders } from '@angular/common/http';
+import { HttpParams } from '@angular/common/http';
 
 @Injectable({
   providedIn: 'root',
@@ -55,7 +56,7 @@ export class EpersonRegistrationService {
    * @param email
    * @param captchaToken the value of x-recaptcha-token header
    */
-  registerEmail(email: string, captchaToken: string = null): Observable<RemoteData<Registration>> {
+  registerEmail(email: string, captchaToken: string = null, type?: string): Observable<RemoteData<Registration>> {
     const registration = new Registration();
     registration.email = email;
 
@@ -70,6 +71,11 @@ export class EpersonRegistrationService {
     }
     options.headers = headers;
 
+    if (hasValue(type)) {
+      options.params = type ?
+        new HttpParams({ fromString: 'accountRequestType=' + type }) : new HttpParams();
+    }
+
     href$.pipe(
       find((href: string) => hasValue(href)),
       map((href: string) => {
diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts
index 9e73ca9a2b..d1692b5f0f 100644
--- a/src/app/core/data/feature-authorization/feature-id.ts
+++ b/src/app/core/data/feature-authorization/feature-id.ts
@@ -32,4 +32,5 @@ export enum FeatureID {
   CanSynchronizeWithORCID = 'canSynchronizeWithORCID',
   CanSubmit = 'canSubmit',
   CanEditItem = 'canEditItem',
+  CanRegisterDOI = 'canRegisterDOI',
 }
diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts
new file mode 100644
index 0000000000..03422dadfb
--- /dev/null
+++ b/src/app/core/data/identifier-data.service.ts
@@ -0,0 +1,85 @@
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { dataService } from './base/data-service.decorator';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { BaseDataService } from './base/base-data.service';
+import { RequestService } from './request.service';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { CoreState } from '../core-state.model';
+import { Observable } from 'rxjs';
+import { RemoteData } from './remote-data';
+import { Item } from '../shared/item.model';
+import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type';
+import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { map, switchMap } from 'rxjs/operators';
+import {ConfigurationProperty} from '../shared/configuration-property.model';
+import {ConfigurationDataService} from './configuration-data.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { PostRequest } from './request.models';
+import { sendRequest } from '../shared/request.operators';
+import { RestRequest } from './rest-request.model';
+
+/**
+ * The service handling all REST requests to get item identifiers like handles and DOIs
+ * from the /identifiers endpoint, as well as the backend configuration that controls whether a 'Register DOI'
+ * button appears for admins in the item status page
+ */
+@Injectable()
+@dataService(IDENTIFIERS)
+export class IdentifierDataService extends BaseDataService<IdentifierData> {
+
+  constructor(
+    protected comparator: DefaultChangeAnalyzer<IdentifierData>,
+    protected halService: HALEndpointService,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService,
+    protected objectCache: ObjectCacheService,
+    protected rdbService: RemoteDataBuildService,
+    protected requestService: RequestService,
+    protected store: Store<CoreState>,
+    private configurationService: ConfigurationDataService,
+  ) {
+    super('identifiers', requestService, rdbService, objectCache, halService);
+  }
+
+  /**
+   * Returns {@link RemoteData} of {@link IdentifierData} representing identifiers for this item
+   * @param item  Item we are querying
+   */
+  getIdentifierDataFor(item: Item): Observable<RemoteData<IdentifierData>> {
+    return this.findByHref(item._links.identifiers.href, false, true);
+  }
+
+  /**
+   * Should we allow registration of new DOIs via the item status page?
+   */
+  public getIdentifierRegistrationConfiguration(): Observable<string[]> {
+    return this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
+      getFirstCompletedRemoteData(),
+      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : [])
+    );
+  }
+
+  public registerIdentifier(item: Item, type: string): Observable<RemoteData<any>> {
+    const requestId = this.requestService.generateRequestId();
+    return this.getEndpoint().pipe(
+      map((endpointURL: string) => {
+        const options: HttpOptions = Object.create({});
+        let headers = new HttpHeaders();
+        headers = headers.append('Content-Type', 'text/uri-list');
+        options.headers = headers;
+        let params = new HttpParams();
+        params = params.append('type', type);
+        options.params = params;
+        return new PostRequest(requestId, endpointURL, item._links.self.href, options);
+      }),
+      sendRequest(this.requestService),
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid) as Observable<RemoteData<any>>)
+    );
+  }
+}
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 09268a0282..80da91acb3 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -232,6 +232,16 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
     return this.rdbService.buildFromRequestUUID(requestId);
   }
 
+  /**
+   * Get the endpoint for an item's identifiers
+   * @param itemId
+   */
+  public getIdentifiersEndpoint(itemId: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      switchMap((url: string) => this.halService.getEndpoint('identifiers', `${url}/${itemId}`))
+    );
+  }
+
   /**
    * Get the endpoint to move the item
    * @param itemId
diff --git a/src/app/core/data/system-wide-alert-data.service.spec.ts b/src/app/core/data/system-wide-alert-data.service.spec.ts
new file mode 100644
index 0000000000..9ba88ce6dd
--- /dev/null
+++ b/src/app/core/data/system-wide-alert-data.service.spec.ts
@@ -0,0 +1,13 @@
+import { SystemWideAlertDataService } from './system-wide-alert-data.service';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testPutDataImplementation } from './base/put-data.spec';
+import { testCreateDataImplementation } from './base/create-data.spec';
+
+describe('SystemWideAlertDataService', () => {
+  describe('composition', () => {
+    const initService = () => new SystemWideAlertDataService(null, null, null, null, null);
+    testFindAllDataImplementation(initService);
+    testPutDataImplementation(initService);
+    testCreateDataImplementation(initService);
+  });
+});
diff --git a/src/app/core/data/system-wide-alert-data.service.ts b/src/app/core/data/system-wide-alert-data.service.ts
new file mode 100644
index 0000000000..51a88b907a
--- /dev/null
+++ b/src/app/core/data/system-wide-alert-data.service.ts
@@ -0,0 +1,104 @@
+import { Injectable } from '@angular/core';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Observable } from 'rxjs';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { FindAllData, FindAllDataImpl } from './base/find-all-data';
+import { FindListOptions } from './find-list-options.model';
+import { dataService } from './base/data-service.decorator';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { CreateData, CreateDataImpl } from './base/create-data';
+import { SYSTEMWIDEALERT } from '../../system-wide-alert/system-wide-alert.resource-type';
+import { SystemWideAlert } from '../../system-wide-alert/system-wide-alert.model';
+import { PutData, PutDataImpl } from './base/put-data';
+import { RequestParam } from '../cache/models/request-param.model';
+import { SearchData, SearchDataImpl } from './base/search-data';
+
+/**
+ * Dataservice representing a system-wide alert
+ */
+@Injectable()
+@dataService(SYSTEMWIDEALERT)
+export class SystemWideAlertDataService extends IdentifiableDataService<SystemWideAlert> implements FindAllData<SystemWideAlert>, CreateData<SystemWideAlert>, PutData<SystemWideAlert>, SearchData<SystemWideAlert> {
+  private findAllData: FindAllDataImpl<SystemWideAlert>;
+  private createData: CreateDataImpl<SystemWideAlert>;
+  private putData: PutDataImpl<SystemWideAlert>;
+  private searchData: SearchData<SystemWideAlert>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('systemwidealerts', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options                     Find list options object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
+   */
+  findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SystemWideAlert>[]): Observable<RemoteData<PaginatedList<SystemWideAlert>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Create a new object on the server, and store the response in the object cache
+   *
+   * @param object    The object to create
+   * @param params    Array with additional params to combine with query string
+   */
+  create(object: SystemWideAlert, ...params: RequestParam[]): Observable<RemoteData<SystemWideAlert>> {
+    return this.createData.create(object, ...params);
+  }
+
+  /**
+   * Send a PUT request for the specified object
+   *
+   * @param object The object to send a put request for.
+   */
+  put(object: SystemWideAlert): Observable<RemoteData<SystemWideAlert>> {
+    return this.putData.put(object);
+  }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>}
+   *    Return an observable that emits response from the server
+   */
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SystemWideAlert>[]): Observable<RemoteData<PaginatedList<SystemWideAlert>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+
+}
diff --git a/src/app/core/profile/researcher-profile-data.service.ts b/src/app/core/profile/researcher-profile-data.service.ts
index 8c62879c37..c43bf696f8 100644
--- a/src/app/core/profile/researcher-profile-data.service.ts
+++ b/src/app/core/profile/researcher-profile-data.service.ts
@@ -3,8 +3,8 @@ import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { Operation, ReplaceOperation } from 'fast-json-patch';
-import { Observable } from 'rxjs';
-import { find, map } from 'rxjs/operators';
+import { Observable, of as observableOf } from 'rxjs';
+import { find, map, mergeMap } from 'rxjs/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -130,6 +130,24 @@ export class ResearcherProfileDataService extends IdentifiableDataService<Resear
     return this.rdbService.buildFromRequestUUID(requestId, followLink('item'));
   }
 
+  /**
+   * Creates a researcher profile starting from an external source URI and returns the related item's ID
+   * Emits null if the researcher profile doesn't exist after sending out the request
+   * @param sourceUri
+   */
+  createFromExternalSourceAndReturnRelatedItemId(sourceUri: string): Observable<string> {
+    return this.createFromExternalSource(sourceUri).pipe(
+      getFirstCompletedRemoteData(),
+      mergeMap((rd: RemoteData<ResearcherProfile>) => {
+        if (rd.hasSucceeded) {
+          return this.findRelatedItemId(rd.payload);
+        } else {
+          return observableOf(null);
+        }
+      }),
+    );
+  }
+
 
   /**
    * Create a new object on the server, and store the response in the object cache
diff --git a/src/app/core/services/server-xhr.service.ts b/src/app/core/services/server-xhr.service.ts
new file mode 100644
index 0000000000..69ae741402
--- /dev/null
+++ b/src/app/core/services/server-xhr.service.ts
@@ -0,0 +1,16 @@
+import { XhrFactory } from '@angular/common';
+import { Injectable } from '@angular/core';
+import { prototype, XMLHttpRequest } from 'xhr2';
+
+/**
+ * Overrides the default XhrFactory server side, to allow us to set cookies in requests to the
+ * backend. This was added to be able to perform a working XSRF request from the node server, as it
+ * needs to set a cookie for the XSRF token
+ */
+@Injectable()
+export class ServerXhrService implements XhrFactory {
+  build(): XMLHttpRequest {
+    prototype._restrictedHeaders.cookie = false;
+    return new XMLHttpRequest();
+  }
+}
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index 28f0d7fd36..3441896ed1 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -24,6 +24,8 @@ import { Bitstream } from './bitstream.model';
 import { ACCESS_STATUS } from 'src/app/shared/object-list/access-status-badge/access-status.resource-type';
 import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
 import { HandleObject } from './handle-object.model';
+import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type';
+import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model';
 
 /**
  * Class representing a DSpace Item
@@ -76,6 +78,7 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject
     version: HALLink;
     thumbnail: HALLink;
     accessStatus: HALLink;
+    identifiers: HALLink;
     self: HALLink;
   };
 
@@ -121,6 +124,13 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject
    @link(ACCESS_STATUS)
    accessStatus?: Observable<RemoteData<AccessStatusObject>>;
 
+  /**
+   * The identifier data for this Item
+   * Will be undefined unless the identifiers {@link HALLink} has been resolved.
+   */
+  @link(IDENTIFIERS, false, 'identifiers')
+  identifiers?: Observable<RemoteData<IdentifierData>>;
+
   /**
    * Method that returns as which type of object this object should be rendered
    */
diff --git a/src/app/core/shared/metadata-representation/metadata-representation.model.ts b/src/app/core/shared/metadata-representation/metadata-representation.model.ts
index 06387966f7..379a3d1be8 100644
--- a/src/app/core/shared/metadata-representation/metadata-representation.model.ts
+++ b/src/app/core/shared/metadata-representation/metadata-representation.model.ts
@@ -1,11 +1,14 @@
 /**
  * An Enum defining the representation type of metadata
  */
+import { BrowseDefinition } from '../browse-definition.model';
+
 export enum MetadataRepresentationType {
   None = 'none',
   Item = 'item',
   AuthorityControlled = 'authority_controlled',
-  PlainText = 'plain_text'
+  PlainText = 'plain_text',
+  BrowseLink = 'browse_link'
 }
 
 /**
@@ -24,8 +27,14 @@ export interface MetadataRepresentation {
    */
   representationType: MetadataRepresentationType;
 
+  /**
+   * The browse definition (optional)
+   */
+  browseDefinition?: BrowseDefinition;
+
   /**
    * Fetches the value to be displayed
    */
   getValue(): string;
+
 }
diff --git a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts
index 595147f3e6..a09de12ae4 100644
--- a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts
+++ b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts
@@ -1,6 +1,7 @@
 import { MetadataRepresentation, MetadataRepresentationType } from '../metadata-representation.model';
 import { hasValue } from '../../../../shared/empty.util';
 import { MetadataValue } from '../../metadata.models';
+import { BrowseDefinition } from '../../browse-definition.model';
 
 /**
  * This class defines the way the metadatum it extends should be represented
@@ -12,9 +13,15 @@ export class MetadatumRepresentation extends MetadataValue implements MetadataRe
    */
   itemType: string;
 
-  constructor(itemType: string) {
+  /**
+   * The browse definition ID passed in with the metadatum, if any
+   */
+  browseDefinition?: BrowseDefinition;
+
+  constructor(itemType: string, browseDefinition?: BrowseDefinition) {
     super();
     this.itemType = itemType;
+    this.browseDefinition = browseDefinition;
   }
 
   /**
@@ -23,6 +30,8 @@ export class MetadatumRepresentation extends MetadataValue implements MetadataRe
   get representationType(): MetadataRepresentationType {
     if (hasValue(this.authority)) {
       return MetadataRepresentationType.AuthorityControlled;
+    } else if (hasValue(this.browseDefinition)) {
+      return MetadataRepresentationType.BrowseLink;
     } else {
       return MetadataRepresentationType.PlainText;
     }
diff --git a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts
new file mode 100644
index 0000000000..f6bfb1ae04
--- /dev/null
+++ b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts
@@ -0,0 +1,9 @@
+/*
+ * Object model for the data returned by the REST API to present minted identifiers in a submission section
+ */
+import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
+
+export interface WorkspaceitemSectionIdentifiersObject {
+  identifiers?: Identifier[]
+  displayTypes?: string[]
+}
diff --git a/src/app/core/submission/models/workspaceitem-sections.model.ts b/src/app/core/submission/models/workspaceitem-sections.model.ts
index 1112d740ed..a3ccd49dac 100644
--- a/src/app/core/submission/models/workspaceitem-sections.model.ts
+++ b/src/app/core/submission/models/workspaceitem-sections.model.ts
@@ -3,6 +3,7 @@ import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.mod
 import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
 import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
 import { WorkspaceitemSectionCcLicenseObject } from './workspaceitem-section-cc-license.model';
+import {WorkspaceitemSectionIdentifiersObject} from './workspaceitem-section-identifiers.model';
 import { WorkspaceitemSectionSherpaPoliciesObject } from './workspaceitem-section-sherpa-policies.model';
 
 /**
@@ -23,4 +24,5 @@ export type WorkspaceitemSectionDataType
   | WorkspaceitemSectionCcLicenseObject
   | WorkspaceitemSectionAccessesObject
   | WorkspaceitemSectionSherpaPoliciesObject
+  | WorkspaceitemSectionIdentifiersObject
   | string;
diff --git a/src/app/core/xsrf/xsrf.interceptor.ts b/src/app/core/xsrf/xsrf.interceptor.ts
index d527924a28..cded432397 100644
--- a/src/app/core/xsrf/xsrf.interceptor.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.ts
@@ -19,6 +19,8 @@ export const XSRF_REQUEST_HEADER = 'X-XSRF-TOKEN';
 export const XSRF_RESPONSE_HEADER = 'DSPACE-XSRF-TOKEN';
 // Name of cookie where we store the XSRF token
 export const XSRF_COOKIE = 'XSRF-TOKEN';
+// Name of cookie the backend expects the XSRF token to be in
+export const DSPACE_XSRF_COOKIE = 'DSPACE-XSRF-COOKIE';
 
 /**
  * Custom Http Interceptor intercepting Http Requests & Responses to
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index 2d1f9b477e..fce2b5c162 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -2,12 +2,7 @@
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalissue.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index f5e9dc9b2b..b749edd732 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 
 @listableObjectComponent('JournalIssue', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { VersionedItemComponent } from '../../../../item-page/simple/item-types/
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue
  */
-export class JournalIssueComponent extends VersionedItemComponent {
+export class JournalIssueComponent extends ItemComponent {
 }
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 010b5ee5b5..772fb162c8 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -2,12 +2,7 @@
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalvolume.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index cc09be7959..89ee4ad1d2 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 
 @listableObjectComponent('JournalVolume', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { VersionedItemComponent } from '../../../../item-page/simple/item-types/
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume
  */
-export class JournalVolumeComponent extends VersionedItemComponent {
+export class JournalVolumeComponent extends ItemComponent {
 }
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index 88ed9e17dd..bf176a3857 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -2,12 +2,7 @@
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journal.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
index 7e20edca6b..6e2ded334b 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
@@ -35,6 +35,10 @@ import { VersionDataService } from '../../../../core/data/version-data.service';
 import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec';
+import {
+  BrowseDefinitionDataServiceStub
+} from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 
 let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
@@ -100,7 +104,8 @@ describe('JournalComponent', () => {
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: SearchService, useValue: {} },
-        { provide: RouteService, useValue: mockRouteService }
+        { provide: RouteService, useValue: mockRouteService },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index acfd31d8f6..4fc03b31c7 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 
 @listableObjectComponent('Journal', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { VersionedItemComponent } from '../../../../item-page/simple/item-types/
 /**
  * The component for displaying metadata and relations of an item of the type Journal
  */
-export class JournalComponent extends VersionedItemComponent {
+export class JournalComponent extends ItemComponent {
 }
diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts
index 07585d4d16..338bbe0cd6 100644
--- a/src/app/entity-groups/journal-entities/journal-entities.module.ts
+++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts
@@ -21,6 +21,7 @@ import { JournalIssueSidebarSearchListElementComponent } from './item-list-eleme
 import { JournalSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component';
 import { ItemSharedModule } from '../../item-page/item-shared.module';
 import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
+import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -49,7 +50,8 @@ const ENTRY_COMPONENTS = [
     CommonModule,
     ItemSharedModule,
     SharedModule,
-    ResultsBackButtonModule
+    ResultsBackButtonModule,
+    DsoPageModule
   ],
   declarations: [
     ...ENTRY_COMPONENTS
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index d8b3815f6e..8251f6b465 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -2,12 +2,7 @@
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'orgunit.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
index cbf8497f35..03a91c34b5 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 
 @listableObjectComponent('OrgUnit', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { VersionedItemComponent } from '../../../../item-page/simple/item-types/
 /**
  * The component for displaying metadata and relations of an item of the type Organisation Unit
  */
-export class OrgUnitComponent extends VersionedItemComponent {
+export class OrgUnitComponent extends ItemComponent {
 }
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index 20e458a906..5cf30d9260 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -2,14 +2,7 @@
 <div class="d-flex flex-row">
   <ds-item-page-title-field class="mr-auto" [item]="object">
   </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-orcid-button [pageRoute]="itemPageRoute" [dso]="object" class="mr-2"></ds-dso-page-orcid-button>
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'person.page.edit'"></ds-dso-page-edit-button>
-    <ds-person-page-claim-button [object]="object"></ds-person-page-claim-button>
-  </div>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
index ad2863034a..e5e2a52338 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 
 @listableObjectComponent('Person', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { VersionedItemComponent } from '../../../../item-page/simple/item-types/
 /**
  * The component for displaying metadata and relations of an item of the type Person
  */
-export class PersonComponent extends VersionedItemComponent {
+export class PersonComponent extends ItemComponent {
 }
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index ee75abaae8..ea5b710085 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -2,12 +2,7 @@
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'project.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
index 066427fc0d..b573ffc58e 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 
 @listableObjectComponent('Project', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { VersionedItemComponent } from '../../../../item-page/simple/item-types/
 /**
  * The component for displaying metadata and relations of an item of the type Project
  */
-export class ProjectComponent extends VersionedItemComponent {
+export class ProjectComponent extends ItemComponent {
 }
diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts
index e3525cc881..680e1bd79f 100644
--- a/src/app/entity-groups/research-entities/research-entities.module.ts
+++ b/src/app/entity-groups/research-entities/research-entities.module.ts
@@ -30,6 +30,7 @@ import { PersonSidebarSearchListElementComponent } from './item-list-elements/si
 import { ProjectSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component';
 import { ItemSharedModule } from '../../item-page/item-shared.module';
 import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
+import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
 
 const ENTRY_COMPONENTS = [
 // put only entry components that use custom decorator
@@ -71,7 +72,8 @@ const COMPONENTS = [
     ItemSharedModule,
     SharedModule,
     NgbTooltipModule,
-    ResultsBackButtonModule
+    ResultsBackButtonModule,
+    DsoPageModule,
   ],
   declarations: [
     ...COMPONENTS,
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.html b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
index 263f142c2e..995108cdbc 100644
--- a/src/app/forgot-password/forgot-password-email/forgot-email.component.html
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
@@ -1,3 +1,3 @@
 <ds-register-email-form
-    [MESSAGE_PREFIX]="'forgot-email.form'">
-</ds-register-email-form>
\ No newline at end of file
+    [MESSAGE_PREFIX]="'forgot-email.form'" [typeRequest]="typeRequest">
+</ds-register-email-form>
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
index af482bdb67..66a61ed7ee 100644
--- a/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { TYPE_REQUEST_FORGOT } from '../../register-email-form/register-email-form.component';
 
 @Component({
   selector: 'ds-forgot-email',
@@ -9,5 +10,5 @@ import { Component } from '@angular/core';
  * Component responsible the forgot password email step
  */
 export class ForgotEmailComponent {
-
+  typeRequest = TYPE_REQUEST_FORGOT;
 }
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 14f9ebeb63..6685df7106 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ContextHelpService } from '../../shared/context-help.service';
-import { Observable, Subscription } from 'rxjs';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 /**
@@ -12,22 +12,15 @@ import { map } from 'rxjs/operators';
   templateUrl: './context-help-toggle.component.html',
   styleUrls: ['./context-help-toggle.component.scss']
 })
-export class ContextHelpToggleComponent implements OnInit, OnDestroy {
+export class ContextHelpToggleComponent implements OnInit {
   buttonVisible$: Observable<boolean>;
 
   constructor(
     private contextHelpService: ContextHelpService,
   ) { }
 
-  private subs: Subscription[];
-
   ngOnInit(): void {
     this.buttonVisible$ = this.contextHelpService.tooltipCount$().pipe(map(x => x > 0));
-    this.subs = [this.buttonVisible$.subscribe()];
-  }
-
-  ngOnDestroy() {
-    this.subs.forEach(sub => sub.unsubscribe());
   }
 
   onClick() {
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index f0e5803b71..9a8535d970 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -17,6 +17,7 @@ import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-con
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { isPlatformBrowser } from '@angular/common';
 import { setPlaceHolderAttributes } from '../../shared/utils/object-list-utils';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 
 @Component({
   selector: 'ds-recent-item-list',
@@ -67,6 +68,7 @@ export class RecentItemListComponent implements OnInit {
     this.itemRD$ = this.searchService.search(
       new PaginatedSearchOptions({
         pagination: this.paginationConfig,
+        dsoTypes: [DSpaceObjectType.ITEM],
         sort: this.sortConfig,
       }),
       undefined,
diff --git a/src/app/init.service.spec.ts b/src/app/init.service.spec.ts
index 592abdfd42..a05f06c78f 100644
--- a/src/app/init.service.spec.ts
+++ b/src/app/init.service.spec.ts
@@ -22,7 +22,6 @@ import { provideMockStore } from '@ngrx/store/testing';
 import { AppComponent } from './app.component';
 import { RouteService } from './core/services/route.service';
 import { getMockLocaleService } from './app.component.spec';
-import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { CorrelationIdService } from './correlation-id/correlation-id.service';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from './shared/mocks/translate-loader.mock';
@@ -124,6 +123,7 @@ describe('InitService', () => {
     let transferStateSpy;
     let metadataServiceSpy;
     let breadcrumbsServiceSpy;
+    let menuServiceSpy;
 
     const BLOCKING = {
       t: {  core: { auth: { blocking: true } } },
@@ -150,6 +150,9 @@ describe('InitService', () => {
       metadataServiceSpy = jasmine.createSpyObj('metadataService', [
         'listenForRouteChange',
       ]);
+      menuServiceSpy = jasmine.createSpyObj('menuServiceSpy', [
+        'listenForRouteChanges',
+      ]);
 
 
       TestBed.resetTestingModule();
@@ -175,7 +178,7 @@ describe('InitService', () => {
           { provide: AuthService, useValue: new AuthServiceMock() },
           { provide: Router, useValue: new RouterMock() },
           { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
-          { provide: MenuService, useValue: new MenuServiceStub() },
+          { provide: MenuService, useValue: menuServiceSpy },
           { provide: ThemeService, useValue: getMockThemeService() },
           provideMockStore({ initialState }),
           AppComponent,
@@ -190,6 +193,7 @@ describe('InitService', () => {
         service.initRouteListeners();
         expect(metadataServiceSpy.listenForRouteChange).toHaveBeenCalledTimes(1);
         expect(breadcrumbsServiceSpy.listenForRouteChanges).toHaveBeenCalledTimes(1);
+        expect(breadcrumbsServiceSpy.listenForRouteChanges).toHaveBeenCalledTimes(1);
       }));
     });
 
diff --git a/src/app/init.service.ts b/src/app/init.service.ts
index e2af88fa65..9fef2ca4ed 100644
--- a/src/app/init.service.ts
+++ b/src/app/init.service.ts
@@ -23,6 +23,7 @@ import { ThemeService } from './shared/theme-support/theme.service';
 import { isAuthenticationBlocking } from './core/auth/selectors';
 import { distinctUntilChanged, find } from 'rxjs/operators';
 import { Observable } from 'rxjs';
+import { MenuService } from './shared/menu/menu.service';
 
 /**
  * Performs the initialization of the app.
@@ -51,6 +52,8 @@ export abstract class InitService {
     protected metadata: MetadataService,
     protected breadcrumbsService: BreadcrumbsService,
     protected themeService: ThemeService,
+    protected menuService: MenuService,
+
   ) {
   }
 
@@ -184,6 +187,7 @@ export abstract class InitService {
     this.metadata.listenForRouteChange();
     this.breadcrumbsService.listenForRouteChanges();
     this.themeService.listenForRouteChanges();
+    this.menuService.listenForRouteChanges();
   }
 
   /**
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index 9458df2249..c370fe4f20 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -3,8 +3,8 @@
         <div class="col-12">
             <h2 class="border-bottom">{{'item.edit.head' | translate}}</h2>
             <div class="pt-2">
-                <ul class="nav nav-tabs justify-content-start">
-                    <li *ngFor="let page of pages" class="nav-item">
+                <ul class="nav nav-tabs justify-content-start" role="tablist">
+                    <li *ngFor="let page of pages" class="nav-item" [attr.aria-selected]="page.page === currentPage" role="tab">
                         <a *ngIf="(page.enabled | async)"
                            class="nav-link"
                            [ngClass]="{'active' : page.page === currentPage}"
diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts
index 70f6c55c28..24d27b3340 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -34,6 +34,9 @@ import { ItemAuthorizationsComponent } from './item-authorizations/item-authoriz
 import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
 import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
 import { ItemVersionsModule } from '../versions/item-versions.module';
+import { IdentifierDataService } from '../../core/data/identifier-data.service';
+import { IdentifierDataComponent } from '../../shared/object-list/identifier-data/identifier-data.component';
+import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
 import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
 
 
@@ -76,10 +79,13 @@ import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
     ItemMoveComponent,
     ItemEditBitstreamDragHandleComponent,
     VirtualMetadataComponent,
-    ItemAuthorizationsComponent
+    ItemAuthorizationsComponent,
+    IdentifierDataComponent,
+    ItemRegisterDoiComponent
   ],
   providers: [
     BundleDataService,
+    IdentifierDataService,
     ObjectValuesPipe
   ],
 })
diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts b/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts
index ce76a614dd..6b0907dceb 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts
@@ -5,3 +5,4 @@ export const ITEM_EDIT_PUBLIC_PATH = 'public';
 export const ITEM_EDIT_DELETE_PATH = 'delete';
 export const ITEM_EDIT_MOVE_PATH = 'move';
 export const ITEM_EDIT_AUTHORIZATIONS_PATH = 'authorizations';
+export const ITEM_EDIT_REGISTER_DOI_PATH = 'register-doi';
diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
index e6fa53f3f3..88172e2620 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -10,6 +10,7 @@ import { ItemStatusComponent } from './item-status/item-status.component';
 import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
 import { ItemMoveComponent } from './item-move/item-move.component';
+import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
 import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
@@ -26,7 +27,8 @@ import {
   ITEM_EDIT_PRIVATE_PATH,
   ITEM_EDIT_PUBLIC_PATH,
   ITEM_EDIT_REINSTATE_PATH,
-  ITEM_EDIT_WITHDRAW_PATH
+  ITEM_EDIT_WITHDRAW_PATH,
+  ITEM_EDIT_REGISTER_DOI_PATH
 } from './edit-item-page.routing-paths';
 import { ItemPageReinstateGuard } from './item-page-reinstate.guard';
 import { ItemPageWithdrawGuard } from './item-page-withdraw.guard';
@@ -38,6 +40,7 @@ import { ItemPageRelationshipsGuard } from './item-page-relationships.guard';
 import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard';
 import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
 import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
+import { ItemPageRegisterDoiGuard } from './item-page-register-doi.guard';
 
 /**
  * Routing module that handles the routing for the Edit Item page administrator functionality
@@ -142,6 +145,12 @@ import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metada
             component: ItemMoveComponent,
             data: { title: 'item.edit.move.title' },
           },
+          {
+            path: ITEM_EDIT_REGISTER_DOI_PATH,
+            component: ItemRegisterDoiComponent,
+            canActivate: [ItemPageRegisterDoiGuard],
+            data: { title: 'item.edit.register-doi.title' },
+          },
           {
             path: ITEM_EDIT_AUTHORIZATIONS_PATH,
             children: [
@@ -186,6 +195,7 @@ import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metada
     ItemPageRelationshipsGuard,
     ItemPageVersionHistoryGuard,
     ItemPageCollectionMapperGuard,
+    ItemPageRegisterDoiGuard,
   ]
 })
 export class EditItemPageRoutingModule {
diff --git a/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts
new file mode 100644
index 0000000000..6a20d4d348
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts
@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthService } from '../../core/auth/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring DOI registration rights
+ */
+export class ItemPageRegisterDoiGuard extends DsoPageSingleFeatureGuard<Item> {
+  constructor(protected resolver: ItemPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check DOI registration authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.CanRegisterDOI);
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-page-status.guard.ts b/src/app/item-page/edit-item-page/item-page-status.guard.ts
index 98f963a4be..ade565da69 100644
--- a/src/app/item-page/edit-item-page/item-page-status.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-status.guard.ts
@@ -27,6 +27,6 @@ export class ItemPageStatusGuard extends DsoPageSomeFeatureGuard<Item> {
    * Check authorization rights
    */
   getFeatureIDs(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID[]> {
-    return observableOf([FeatureID.CanManageMappings, FeatureID.WithdrawItem, FeatureID.ReinstateItem, FeatureID.CanManagePolicies, FeatureID.CanMakePrivate, FeatureID.CanDelete, FeatureID.CanMove]);
+    return observableOf([FeatureID.CanManageMappings, FeatureID.WithdrawItem, FeatureID.ReinstateItem, FeatureID.CanManagePolicies, FeatureID.CanMakePrivate, FeatureID.CanDelete, FeatureID.CanMove, FeatureID.CanRegisterDOI]);
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
new file mode 100644
index 0000000000..89f5718fc4
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
@@ -0,0 +1,24 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
+      <p>{{descriptionMessage | translate}}</p>
+      <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 p">
+        <div *ngIf="(identifier.identifierType=='doi')">
+          <p class="float-left">{{doiToUpdateMessage | translate}}: {{identifier.value}}
+            ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
+          </p>
+        </div>
+      </div>
+      <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
+      <div class="space-children-mr">
+        <button (click)="performAction()" class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
+        </button>
+        <button [routerLink]="[itemPageRoute, 'edit']" class="btn btn-outline-secondary cancel">
+          {{cancelMessage| translate}}
+        </button>
+      </div>
+    </div>
+  </div>
+
+</div>
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts
new file mode 100644
index 0000000000..af52114642
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts
@@ -0,0 +1,106 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { Item } from '../../../core/shared/item.model';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { of as observableOf } from 'rxjs';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { ItemRegisterDoiComponent } from './item-register-doi.component';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+
+let comp: ItemRegisterDoiComponent;
+let fixture: ComponentFixture<ItemRegisterDoiComponent>;
+
+let mockItem;
+let itemPageUrl;
+let routerStub;
+let mockItemDataService: ItemDataService;
+let mockIdentifierDataService: IdentifierDataService;
+let routeStub;
+let notificationsServiceStub;
+
+describe('ItemRegisterDoiComponent', () => {
+  beforeEach(waitForAsync(() => {
+
+    mockItem = Object.assign(new Item(), {
+      id: 'fake-id',
+      handle: 'fake/handle',
+      lastModified: '2018',
+      isWithdrawn: true
+    });
+
+    itemPageUrl = `fake-url/${mockItem.id}`;
+    routerStub = Object.assign(new RouterStub(), {
+      url: `${itemPageUrl}/edit`
+    });
+
+    mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', {
+      getIdentifierDataFor: createSuccessfulRemoteDataObject$({'identifiers': []}),
+      getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true'),
+      registerIdentifier: createSuccessfulRemoteDataObject$({'identifiers': []}),
+    });
+
+    mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
+      registerDOI: createSuccessfulRemoteDataObject$(mockItem)
+    });
+
+    routeStub = {
+      data: observableOf({
+        dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
+          id: 'fake-id'
+        }))
+      })
+    };
+
+    notificationsServiceStub = new NotificationsServiceStub();
+
+    TestBed.configureTestingModule({
+      imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
+      declarations: [ItemRegisterDoiComponent],
+      providers: [
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: Router, useValue: routerStub },
+        { provide: ItemDataService, useValue: mockItemDataService },
+        { provide: IdentifierDataService, useValue: mockIdentifierDataService},
+        { provide: NotificationsService, useValue: notificationsServiceStub }
+      ], schemas: [
+        CUSTOM_ELEMENTS_SCHEMA
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemRegisterDoiComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should render a page with messages based on the \'register-doi\' messageKey', () => {
+    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    expect(header.innerHTML).toContain('item.edit.register-doi.header');
+    const description = fixture.debugElement.query(By.css('p')).nativeElement;
+    expect(description.innerHTML).toContain('item.edit.register-doi.description');
+    const confirmButton = fixture.debugElement.query(By.css('button.perform-action')).nativeElement;
+    expect(confirmButton.innerHTML).toContain('item.edit.register-doi.confirm');
+    const cancelButton = fixture.debugElement.query(By.css('button.cancel')).nativeElement;
+    expect(cancelButton.innerHTML).toContain('item.edit.register-doi.cancel');
+  });
+
+  describe('performAction', () => {
+    it('should call registerDOI function from the ItemDataService', () => {
+      spyOn(comp, 'processRestResponse');
+      comp.performAction();
+      expect(mockIdentifierDataService.registerIdentifier).toHaveBeenCalledWith(comp.item, 'doi');
+      expect(comp.processRestResponse).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
new file mode 100644
index 0000000000..54878c6026
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
@@ -0,0 +1,95 @@
+import { Component } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { first, map } from 'rxjs/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { Observable } from 'rxjs';
+import { getItemPageRoute } from '../../item-page-routing-paths';
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
+
+@Component({
+  selector: 'ds-item-register-doi',
+  templateUrl: './item-register-doi-component.html'
+})
+/**
+ * Component responsible for rendering the Item Register DOI page
+ */
+export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent {
+
+  protected messageKey = 'register-doi';
+  doiToUpdateMessage = 'item.edit.' + this.messageKey + '.to-update';
+  identifiers$: Observable<Identifier[]>;
+  processing = false;
+
+  constructor(protected route: ActivatedRoute,
+              protected router: Router,
+              protected notificationsService: NotificationsService,
+              protected itemDataService: ItemDataService,
+              protected translateService: TranslateService,
+              protected identifierDataService: IdentifierDataService) {
+    super(route, router, notificationsService, itemDataService, translateService);
+  }
+
+  /**
+   * Initialise component
+   */
+  ngOnInit(): void {
+    this.itemRD$ = this.route.data.pipe(
+      map((data) => data.dso),
+      getFirstSucceededRemoteData()
+    )as Observable<RemoteData<Item>>;
+
+    this.itemRD$.pipe(first()).subscribe((rd) => {
+        this.item = rd.payload;
+        this.itemPageRoute = getItemPageRoute(this.item);
+        this.identifiers$ = this.identifierDataService.getIdentifierDataFor(this.item).pipe(
+          map((identifierRD) => {
+            if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
+              return identifierRD.payload.identifiers;
+            } else {
+              return null;
+            }
+          }),
+        );
+      }
+    );
+
+    this.confirmMessage = 'item.edit.' + this.messageKey + '.confirm';
+    this.cancelMessage = 'item.edit.' + this.messageKey + '.cancel';
+    this.headerMessage = 'item.edit.' + this.messageKey + '.header';
+    this.descriptionMessage = 'item.edit.' + this.messageKey + '.description';
+
+
+  }
+
+  /**
+   * Perform the register DOI action to the item
+   */
+  performAction() {
+    this.registerDoi();
+  }
+
+  /**
+   * Request that a pending, minted or null DOI be queued for registration
+   */
+  registerDoi() {
+    this.processing = true;
+    this.identifierDataService.registerIdentifier(this.item, 'doi').subscribe(
+      (response: RemoteData<Item>) => {
+        if (response.hasCompleted) {
+          this.processing = false;
+          this.processRestResponse(response);
+        }
+      }
+    );
+  }
+
+}
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index d4f61c99c1..8d4faaa2ac 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -8,6 +8,17 @@
       {{statusData[statusKey]}}
     </div>
   </div>
+
+  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100">
+    <div *ngIf="(identifier.identifierType=='doi')">
+      <div class="col-3 float-left status-label">
+        {{identifier.identifierType.toLocaleUpperCase()}}
+      </div>
+      <div class="col-9 float-left status-label">{{identifier.value}}
+        ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
+    </div>
+  </div>
+
   <div class="col-3 float-left status-label">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
@@ -18,4 +29,5 @@
   <div *ngFor="let operation of (operations$ | async)" class="w-100" [ngClass]="{'pt-3': operation}">
     <ds-item-operation *ngIf="operation" [operation]="operation"></ds-item-operation>
   </div>
+
 </div>
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
index 0829480670..a67de2f435 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
@@ -11,8 +11,14 @@ import { Item } from '../../../core/shared/item.model';
 import { By } from '@angular/platform-browser';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+
+let mockIdentifierDataService: IdentifierDataService;
+let mockConfigurationDataService: ConfigurationDataService;
 
 describe('ItemStatusComponent', () => {
   let comp: ItemStatusComponent;
@@ -28,6 +34,20 @@ describe('ItemStatusComponent', () => {
     }
   });
 
+  mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', {
+    getIdentifierDataFor: createSuccessfulRemoteDataObject$({'identifiers': []}),
+    getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true')
+  });
+
+  mockConfigurationDataService = jasmine.createSpyObj('configurationDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+      name: 'identifiers.item-status.register-doi',
+      values: [
+        'true'
+      ]
+    }))
+  });
+
   const itemPageUrl = `/items/${mockItem.uuid}`;
 
   const routeStub = {
@@ -50,6 +70,8 @@ describe('ItemStatusComponent', () => {
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: IdentifierDataService, useValue: mockIdentifierDataService },
+        { provide: ConfigurationDataService, useValue: mockConfigurationDataService }
       ], schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
   }));
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index f01f5c1f7a..c2db518415 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -3,14 +3,21 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
 import { Item } from '../../../core/shared/item.model';
 import { ActivatedRoute } from '@angular/router';
 import { ItemOperation } from '../item-operation/itemOperation.model';
-import { distinctUntilChanged, first, map, mergeMap, toArray } from 'rxjs/operators';
-import { BehaviorSubject, Observable, from as observableFrom } from 'rxjs';
+import { distinctUntilChanged, first, map, mergeMap, switchMap, toArray } from 'rxjs/operators';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { hasValue } from '../../../shared/empty.util';
-import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import {
+  getAllSucceededRemoteDataPayload, getFirstSucceededRemoteData, getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { IdentifierData } from '../../../shared/object-list/identifier-data/identifier-data.model';
 
 @Component({
   selector: 'ds-item-status',
@@ -47,9 +54,15 @@ export class ItemStatusComponent implements OnInit {
   operations$: BehaviorSubject<ItemOperation[]> = new BehaviorSubject<ItemOperation[]>([]);
 
   /**
-   * The keys of the actions (to loop over)
+   * Identifiers (handles, DOIs)
    */
-  actionsKeys;
+  identifiers$: Observable<Identifier[]>;
+
+  /**
+   * Configuration and state variables regarding DOIs
+   */
+
+  public subs: Subscription[] = [];
 
   /**
    * Route to the item's page
@@ -57,9 +70,15 @@ export class ItemStatusComponent implements OnInit {
   itemPageRoute$: Observable<string>;
 
   constructor(private route: ActivatedRoute,
-              private authorizationService: AuthorizationDataService) {
+              private authorizationService: AuthorizationDataService,
+              private identifierDataService: IdentifierDataService,
+              private configurationService: ConfigurationDataService,
+  ) {
   }
 
+  /**
+   * Initialise component
+   */
   ngOnInit(): void {
     this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso));
     this.itemRD$.pipe(
@@ -72,12 +91,37 @@ export class ItemStatusComponent implements OnInit {
         lastModified: item.lastModified
       });
       this.statusDataKeys = Object.keys(this.statusData);
+
+      // Observable for item identifiers (retrieved from embedded link)
+      this.identifiers$ = this.identifierDataService.getIdentifierDataFor(item).pipe(
+        map((identifierRD) => {
+          if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
+            return identifierRD.payload.identifiers;
+          } else {
+            return null;
+          }
+        }),
+      );
+
+      // Observable for configuration determining whether the Register DOI feature is enabled
+      let registerConfigEnabled$: Observable<boolean> = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+        map((enabled: ConfigurationProperty) => {
+          if (enabled !== undefined && enabled.values) {
+            return true;
+          }
+          return false;
+        })
+      );
+
       /*
+      Construct a base list of operations.
         The key is used to build messages
           i18n example: 'item.edit.tabs.status.buttons.<key>.label'
         The value is supposed to be a href for the button
       */
-      const operations = [];
+      const operations: ItemOperation[] = [];
       operations.push(new ItemOperation('authorizations', this.getCurrentUrl(item) + '/authorizations', FeatureID.CanManagePolicies, true));
       operations.push(new ItemOperation('mappedCollections', this.getCurrentUrl(item) + '/mapper', FeatureID.CanManageMappings, true));
       if (item.isWithdrawn) {
@@ -92,27 +136,74 @@ export class ItemStatusComponent implements OnInit {
       }
       operations.push(new ItemOperation('delete', this.getCurrentUrl(item) + '/delete', FeatureID.CanDelete, true));
       operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move', FeatureID.CanMove, true));
-
       this.operations$.next(operations);
 
-      observableFrom(operations).pipe(
-        mergeMap((operation) => {
-          if (hasValue(operation.featureID)) {
-            return this.authorizationService.isAuthorized(operation.featureID, item.self).pipe(
+      /*
+       When the identifier data stream changes, determine whether the register DOI button should be shown or not.
+       This is based on whether the DOI is in the right state (minted or pending, not already queued for registration
+       or registered) and whether the configuration property identifiers.item-status.register-doi is true
+       */
+      this.identifierDataService.getIdentifierDataFor(item).pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+        mergeMap((data: IdentifierData) => {
+          let identifiers = data.identifiers;
+          let no_doi = true;
+          let pending = false;
+          if (identifiers !== undefined && identifiers !== null) {
+            identifiers.forEach((identifier: Identifier) => {
+              if (hasValue(identifier) && identifier.identifierType === 'doi') {
+                // The item has some kind of DOI
+                no_doi = false;
+                if (identifier.identifierStatus === 'PENDING' || identifier.identifierStatus === 'MINTED'
+                  || identifier.identifierStatus == null) {
+                  // The item's DOI is pending, minted or null.
+                  // It isn't registered, reserved, queued for registration or reservation or update, deleted
+                  // or queued for deletion.
+                  pending = true;
+                }
+              }
+            });
+          }
+          // If there is no DOI, or a pending/minted/null DOI, and the config is enabled, return true
+          return registerConfigEnabled$.pipe(
+            map((enabled: boolean) => {
+              return enabled && (pending || no_doi);
+            }
+          ));
+        }),
+        // Switch map pushes the register DOI operation onto a copy of the base array then returns to the pipe
+        switchMap((showDoi: boolean) => {
+          let ops = [...operations];
+          if (showDoi) {
+            ops.push(new ItemOperation('register-doi', this.getCurrentUrl(item) + '/register-doi', FeatureID.CanRegisterDOI, true));
+          }
+          return ops;
+        }),
+        // Merge map checks and transforms each operation in the array based on whether it is authorized or not (disabled)
+        mergeMap((op: ItemOperation) => {
+          if (hasValue(op.featureID)) {
+            return this.authorizationService.isAuthorized(op.featureID, item.self).pipe(
               distinctUntilChanged(),
-              map((authorized) => new ItemOperation(operation.operationKey, operation.operationUrl, operation.featureID, !authorized, authorized))
+              map((authorized) => new ItemOperation(op.operationKey, op.operationUrl, op.featureID, !authorized, authorized))
             );
           } else {
-            return [operation];
+            return [op];
           }
         }),
-        toArray()
-      ).subscribe((ops) => this.operations$.next(ops));
+        // Wait for all operations to be emitted and return as an array
+        toArray(),
+      ).subscribe((data) => {
+        // Update the operations$ subject that draws the administrative buttons on the status page
+        this.operations$.next(data);
+      });
     });
+
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
       map((item) => getItemPageRoute(item))
     );
+
   }
 
   /**
@@ -127,4 +218,10 @@ export class ItemStatusComponent implements OnInit {
     return hasValue(operation) ? operation.operationKey : undefined;
   }
 
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+
 }
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index becb35e4bd..61088edd16 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -1,16 +1,38 @@
 <ds-metadata-field-wrapper [label]="label | translate">
     <ng-container *ngFor="let mdValue of mdValues; let last=last;">
-      <ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : simple); context: {value: mdValue.value}">
+      <!--
+      Choose a template. Priority: markdown, link, browse link.
+      -->
+      <ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : (hasLink(mdValue) ? link : (hasBrowseDefinition() ? browselink : simple)));
+        context: {value: mdValue.value}">
       </ng-container>
       <span class="separator" *ngIf="!last" [innerHTML]="separator"></span>
     </ng-container>
 </ds-metadata-field-wrapper>
 
+<!-- Render value as markdown -->
 <ng-template #markdown let-value="value">
   <span class="dont-break-out" [innerHTML]="value | dsMarkdown | async">
   </span>
 </ng-template>
 
+<!-- Render value as a link (href and label) -->
+<ng-template #link let-value="value">
+    <a class="dont-break-out ds-simple-metadata-link" target="_blank" [href]="value">
+      {{value}}
+    </a>
+</ng-template>
+
+<!-- Render simple value in a span  -->
 <ng-template #simple let-value="value">
   <span class="dont-break-out preserve-line-breaks">{{value}}</span>
 </ng-template>
+
+<!-- Render value as a link to browse index -->
+<ng-template #browselink let-value="value">
+  <a class="dont-break-out preserve-line-breaks ds-browse-link"
+     [routerLink]="['/browse', browseDefinition.id]"
+     [queryParams]="getQueryParams(value)">
+    {{value}}
+  </a>
+</ng-template>
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
index 9e599b1294..23f8098207 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
@@ -52,6 +52,7 @@ describe('MetadataValuesComponent', () => {
     comp.mdValues = mockMetadata;
     comp.separator = mockSeperator;
     comp.label = mockLabel;
+    comp.urlRegex = /^.*test.*$/;
     fixture.detectChanges();
   }));
 
@@ -67,4 +68,9 @@ describe('MetadataValuesComponent', () => {
     expect(separators.length).toBe(mockMetadata.length - 1);
   });
 
+  it('should correctly detect a pattern on string containing "test"', () => {
+    const mdValue = {value: 'This is a test value'} as MetadataValue;
+    expect(comp.hasLink(mdValue)).toBe(true);
+  });
+
 });
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index 3f0c918796..49ce453fbe 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -1,6 +1,8 @@
 import { Component, Inject, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
+import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * This component renders the configured 'values' into the ds-metadata-field-wrapper component.
@@ -40,12 +42,51 @@ export class MetadataValuesComponent implements OnChanges {
    */
   @Input() enableMarkdown = false;
 
+  /**
+   * Whether any valid HTTP(S) URL should be rendered as a link
+   */
+  @Input() urlRegex?;
+
   /**
    * This variable will be true if both {@link environment.markdown.enabled} and {@link enableMarkdown} are true.
    */
   renderMarkdown;
 
+  @Input() browseDefinition?: BrowseDefinition;
+
   ngOnChanges(changes: SimpleChanges): void {
     this.renderMarkdown = !!this.appConfig.markdown.enabled && this.enableMarkdown;
   }
+
+  /**
+   * Does this metadata value have a configured link to a browse definition?
+   */
+  hasBrowseDefinition(): boolean {
+    return hasValue(this.browseDefinition);
+  }
+
+  /**
+   * Does this metadata value have a valid URL that should be rendered as a link?
+   * @param value A MetadataValue being displayed
+   */
+  hasLink(value: MetadataValue): boolean {
+    if (hasValue(this.urlRegex)) {
+      const pattern = new RegExp(this.urlRegex);
+      return pattern.test(value.value);
+    }
+    return false;
+  }
+
+  /**
+   * Return a queryparams object for use in a link, with the key dependent on whether this browse
+   * definition is metadata browse, or item browse
+   * @param value the specific metadata value being linked
+   */
+  getQueryParams(value) {
+    let queryParams = {startsWith: value};
+    if (this.browseDefinition.metadataBrowse) {
+      return {value: value};
+    }
+    return queryParams;
+  }
 }
diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
index ee4ead2835..562ee52f2a 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -7,10 +7,8 @@
       <div *ngIf="!item.isWithdrawn || (isAdmin$|async)" class="full-item-info">
         <div class="d-flex flex-row">
           <ds-item-page-title-field class="mr-auto" [item]="item"></ds-item-page-title-field>
-          <div class="pl-2 space-children-mr">
-            <ds-dso-page-edit-button [pageRoute]="itemPageRoute$ | async" [dso]="item"
-                                     [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
-          </div>
+        <ds-dso-edit-menu></ds-dso-edit-menu>
+
         </div>
         <div class="simple-view-link my-3" *ngIf="!fromSubmissionObject">
           <a class="btn btn-outline-primary" [routerLink]="[(itemPageRoute$ | async)]">
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts
index b713b8ed78..0c855ab34d 100644
--- a/src/app/item-page/item-page-routing.module.ts
+++ b/src/app/item-page/item-page-routing.module.ts
@@ -18,6 +18,7 @@ import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/
 import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths';
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
 import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
+import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 
 @NgModule({
   imports: [
@@ -26,7 +27,8 @@ import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
         path: ':id',
         resolve: {
           dso: ItemPageResolver,
-          breadcrumb: ItemBreadcrumbResolver
+          breadcrumb: ItemBreadcrumbResolver,
+          menu: DSOEditMenuResolver
         },
         runGuardsAndResolvers: 'always',
         children: [
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index 53c679e596..c30438a75f 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -39,7 +39,6 @@ import { MediaViewerImageComponent } from './media-viewer/media-viewer-image/med
 import { NgxGalleryModule } from '@kolkov/ngx-gallery';
 import { MiradorViewerComponent } from './mirador-viewer/mirador-viewer.component';
 import { VersionPageComponent } from './version-page/version-page/version-page.component';
-import { VersionedItemComponent } from './simple/item-types/versioned-item/versioned-item.component';
 import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component';
 import { OrcidAuthComponent } from './orcid-page/orcid-auth/orcid-auth.component';
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
@@ -53,6 +52,7 @@ import { ItemVersionsModule } from './versions/item-versions.module';
 import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
 import { FileSectionComponent } from './simple/field-components/file-section/file-section.component';
 import { ItemSharedModule } from './item-shared.module';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 
 
 const ENTRY_COMPONENTS = [
@@ -91,7 +91,6 @@ const DECLARATIONS = [
   OrcidSyncSettingsComponent,
   OrcidQueueComponent,
   ItemAlertsComponent,
-  VersionedItemComponent,
   BitstreamRequestACopyPageComponent,
 ];
 
@@ -109,7 +108,8 @@ const DECLARATIONS = [
     NgxGalleryModule,
     NgbAccordionModule,
     ResultsBackButtonModule,
-    UploadModule
+    UploadModule,
+    DsoPageModule,
   ],
   declarations: [
     ...DECLARATIONS,
diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts
index c558b11692..0249e3cf22 100644
--- a/src/app/item-page/item-shared.module.ts
+++ b/src/app/item-page/item-shared.module.ts
@@ -10,16 +10,14 @@ import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/
 import { ItemVersionsDeleteModalComponent } from './versions/item-versions-delete-modal/item-versions-delete-modal.component';
 import { ItemVersionsSummaryModalComponent } from './versions/item-versions-summary-modal/item-versions-summary-modal.component';
 import { MetadataValuesComponent } from './field-components/metadata-values/metadata-values.component';
-import { DsoPageVersionButtonComponent } from '../shared/dso-page/dso-page-version-button/dso-page-version-button.component';
-import { PersonPageClaimButtonComponent } from '../shared/dso-page/person-page-claim-button/person-page-claim-button.component';
 import { GenericItemPageFieldComponent } from './simple/field-components/specific-field/generic/generic-item-page-field.component';
 import { MetadataRepresentationListComponent } from './simple/metadata-representation-list/metadata-representation-list.component';
 import { RelatedItemsComponent } from './simple/related-items/related-items-component';
-import { DsoPageOrcidButtonComponent } from '../shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component';
 
 const ENTRY_COMPONENTS = [
   ItemVersionsDeleteModalComponent,
   ItemVersionsSummaryModalComponent,
+
 ];
 
 const COMPONENTS = [
@@ -27,12 +25,9 @@ const COMPONENTS = [
   RelatedEntitiesSearchComponent,
   TabbedRelatedEntitiesSearchComponent,
   MetadataValuesComponent,
-  DsoPageVersionButtonComponent,
-  PersonPageClaimButtonComponent,
   GenericItemPageFieldComponent,
   MetadataRepresentationListComponent,
   RelatedItemsComponent,
-  DsoPageOrcidButtonComponent
 ];
 
 @NgModule({
diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
index 53f0522f39..bfed3847c5 100644
--- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
@@ -7,6 +7,8 @@ import { SharedModule } from '../../../../../shared/shared.module';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
 import { By } from '@angular/platform-browser';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
 let comp: ItemPageAbstractFieldComponent;
 let fixture: ComponentFixture<ItemPageAbstractFieldComponent>;
@@ -25,6 +27,7 @@ describe('ItemPageAbstractFieldComponent', () => {
       ],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
       ],
       declarations: [ItemPageAbstractFieldComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
index 7f8d6fb812..855a995142 100644
--- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
@@ -3,10 +3,12 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
 import { ItemPageAuthorFieldComponent } from './item-page-author-field.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
 let comp: ItemPageAuthorFieldComponent;
 let fixture: ComponentFixture<ItemPageAuthorFieldComponent>;
@@ -25,6 +27,7 @@ describe('ItemPageAuthorFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
       ],
       declarations: [ItemPageAuthorFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
@@ -37,7 +40,7 @@ describe('ItemPageAuthorFieldComponent', () => {
     beforeEach(waitForAsync(() => {
       fixture = TestBed.createComponent(ItemPageAuthorFieldComponent);
       comp = fixture.componentInstance;
-      comp.item = mockItemWithMetadataFieldAndValue(field, mockValue);
+      comp.item = mockItemWithMetadataFieldsAndValue([field], mockValue);
       fixture.detectChanges();
     }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
index ebd37e8b8a..be124dab82 100644
--- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
@@ -3,10 +3,12 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
 import { ItemPageDateFieldComponent } from './item-page-date-field.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
 let comp: ItemPageDateFieldComponent;
 let fixture: ComponentFixture<ItemPageDateFieldComponent>;
@@ -25,6 +27,7 @@ describe('ItemPageDateFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
       ],
       declarations: [ItemPageDateFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
@@ -36,7 +39,7 @@ describe('ItemPageDateFieldComponent', () => {
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(ItemPageDateFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
     fixture.detectChanges();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
index f055101f2a..fdf5ac1bb5 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
@@ -3,10 +3,12 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
 import { GenericItemPageFieldComponent } from './generic-item-page-field.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
 let comp: GenericItemPageFieldComponent;
 let fixture: ComponentFixture<GenericItemPageFieldComponent>;
@@ -27,6 +29,7 @@ describe('GenericItemPageFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
       ],
       declarations: [GenericItemPageFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
@@ -38,7 +41,7 @@ describe('GenericItemPageFieldComponent', () => {
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(GenericItemPageFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
     comp.fields = mockFields;
     comp.label = mockLabel;
     fixture.detectChanges();
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
index 9d818e2f7d..53d2f6aa20 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
@@ -40,5 +40,10 @@ export class GenericItemPageFieldComponent extends ItemPageFieldComponent {
    */
   @Input() enableMarkdown = false;
 
+  /**
+   * Whether any valid HTTP(S) URL should be rendered as a link
+   */
+  @Input() urlRegex?: string;
+
 
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
index 8b017c77f5..91d40b0ad7 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
@@ -4,5 +4,7 @@
     [separator]="separator"
     [label]="label"
     [enableMarkdown]="enableMarkdown"
+    [urlRegex]="urlRegex"
+    [browseDefinition]="browseDefinition|async"
   ></ds-metadata-values>
 </div>
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
index e41fd1b8a7..15b7a9df21 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
@@ -12,6 +12,10 @@ import { environment } from '../../../../../environments/environment';
 import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe';
 import { SharedModule } from '../../../../shared/shared.module';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { By } from '@angular/platform-browser';
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { RouterTestingModule } from '@angular/router/testing';
 
 let comp: ItemPageFieldComponent;
 let fixture: ComponentFixture<ItemPageFieldComponent>;
@@ -20,7 +24,9 @@ let markdownSpy;
 const mockValue = 'test value';
 const mockField = 'dc.test';
 const mockLabel = 'test label';
-const mockFields = [mockField];
+const mockAuthorField = 'dc.contributor.author';
+const mockDateIssuedField = 'dc.date.issued';
+const mockFields = [mockField, mockAuthorField, mockDateIssuedField];
 
 describe('ItemPageFieldComponent', () => {
 
@@ -34,6 +40,7 @@ describe('ItemPageFieldComponent', () => {
   const buildTestEnvironment = async () => {
     await TestBed.configureTestingModule({
       imports: [
+        RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
@@ -44,6 +51,7 @@ describe('ItemPageFieldComponent', () => {
       ],
       providers: [
         { provide: APP_CONFIG, useValue: appConfig },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
       ],
       declarations: [ItemPageFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
@@ -53,7 +61,7 @@ describe('ItemPageFieldComponent', () => {
     markdownSpy = spyOn(MarkdownPipe.prototype, 'transform');
     fixture = TestBed.createComponent(ItemPageFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue(mockFields, mockValue);
     comp.fields = mockFields;
     comp.label = mockLabel;
     fixture.detectChanges();
@@ -126,17 +134,57 @@ describe('ItemPageFieldComponent', () => {
         expect(markdownSpy).toHaveBeenCalled();
       });
     });
+
   });
+
+  describe('test rendering of configured browse links', () => {
+    beforeEach(() => {
+      fixture.detectChanges();
+    });
+    waitForAsync(() => {
+      it('should have a browse link', () => {
+        expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockValue);
+      });
+    });
+  });
+
+  describe('test rendering of configured regex-based links', () => {
+    beforeEach(() => {
+      comp.urlRegex = '^test';
+      fixture.detectChanges();
+    });
+    waitForAsync(() => {
+      it('should have a rendered (non-browse) link since the value matches ^test', () => {
+        expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link')).nativeElement.innerHTML).toContain(mockValue);
+      });
+    });
+  });
+
+  describe('test skipping of configured links that do NOT match regex', () => {
+    beforeEach(() => {
+      comp.urlRegex = '^nope';
+      fixture.detectChanges();
+    });
+    beforeEach(waitForAsync(() => {
+      it('should NOT have a rendered (non-browse) link since the value matches ^test', () => {
+        expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link'))).toBeNull();
+      });
+    }));
+  });
+
+
 });
 
-export function mockItemWithMetadataFieldAndValue(field: string, value: string): Item {
+export function mockItemWithMetadataFieldsAndValue(fields: string[], value: string): Item {
   const item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: new MetadataMap()
   });
-  item.metadata[field] = [{
-    language: 'en_US',
-    value: value
-  }] as MetadataValue[];
+  fields.forEach((field: string) => {
+    item.metadata[field] = [{
+      language: 'en_US',
+      value: value
+    }] as MetadataValue[];
+  });
   return item;
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
index 681c5e16bc..fc526dabcc 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
@@ -1,5 +1,10 @@
 import { Component, Input } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
+import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import { getRemoteDataPayload } from '../../../../core/shared/operators';
 
 /**
  * This component can be used to represent metadata on a simple item page.
@@ -12,6 +17,9 @@ import { Item } from '../../../../core/shared/item.model';
 })
 export class ItemPageFieldComponent {
 
+    constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
+    }
+
     /**
      * The item to display metadata for
      */
@@ -38,4 +46,19 @@ export class ItemPageFieldComponent {
      */
     separator = '<br/>';
 
+    /**
+     * Whether any valid HTTP(S) URL should be rendered as a link
+     */
+    urlRegex?: string;
+
+    /**
+     * Return browse definition that matches any field used in this component if it is configured as a browse
+     * link in dspace.cfg (webui.browse.link.<n>)
+     */
+    get browseDefinition(): Observable<BrowseDefinition> {
+      return this.browseDefinitionDataService.findByFields(this.fields).pipe(
+        getRemoteDataPayload(),
+        map((def) => def)
+      );
+    }
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
index bc661e81c9..316e08e564 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
@@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
 import { ItemPageTitleFieldComponent } from './item-page-title-field.component';
 
 let comp: ItemPageTitleFieldComponent;
@@ -31,7 +31,7 @@ describe('ItemPageTitleFieldComponent', () => {
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(ItemPageTitleFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
     fixture.detectChanges();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
index 7c766252a3..cc55b76e3e 100644
--- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
@@ -2,11 +2,13 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
 import { ItemPageUriFieldComponent } from './item-page-uri-field.component';
 import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component';
 import { environment } from '../../../../../../environments/environment';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
 let comp: ItemPageUriFieldComponent;
 let fixture: ComponentFixture<ItemPageUriFieldComponent>;
@@ -26,6 +28,7 @@ describe('ItemPageUriFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
       ],
       declarations: [ItemPageUriFieldComponent, MetadataUriValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
@@ -37,7 +40,7 @@ describe('ItemPageUriFieldComponent', () => {
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(ItemPageUriFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
     comp.fields = [mockField];
     comp.label = mockLabel;
     fixture.detectChanges();
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 9b7861c73c..214ce23045 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -11,12 +11,7 @@
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'publication.page.edit'"></ds-dso-page-edit-button>
-  </div>
+    <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
index 3c2ff4f844..211ec102bc 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
@@ -36,6 +36,10 @@ import { VersionDataService } from '../../../../core/data/version-data.service';
 import { RouterTestingModule } from '@angular/router/testing';
 import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { SearchService } from '../../../../core/shared/search/search.service';
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import {
+  BrowseDefinitionDataServiceStub
+} from '../../../../shared/testing/browse-definition-data-service.stub';
 
 const noMetadata = new MetadataMap();
 
@@ -87,7 +91,8 @@ describe('PublicationComponent', () => {
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: SearchService, useValue: {} },
-        { provide: RouteService, useValue: mockRouteService }
+        { provide: RouteService, useValue: mockRouteService },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.ts b/src/app/item-page/simple/item-types/publication/publication.component.ts
index ba5037a104..bd0d371183 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../versioned-item/versioned-item.component';
+import { ItemComponent } from '../shared/item.component';
 
 /**
  * Component that represents a publication Item page
@@ -14,6 +14,6 @@ import { VersionedItemComponent } from '../versioned-item/versioned-item.compone
   templateUrl: './publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class PublicationComponent extends VersionedItemComponent {
+export class PublicationComponent extends ItemComponent {
 
 }
diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
index cb91a31b06..5bf08fc004 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
@@ -23,7 +23,9 @@ import { UUIDService } from '../../../../core/shared/uuid.service';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import {
+  createSuccessfulRemoteDataObject$
+} from '../../../../shared/remote-data.utils';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
@@ -38,6 +40,10 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history
 import { RouterTestingModule } from '@angular/router/testing';
 import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service';
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import {
+  BrowseDefinitionDataServiceStub
+} from '../../../../shared/testing/browse-definition-data-service.stub';
 
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
@@ -125,7 +131,8 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
           { provide: SearchService, useValue: {} },
           { provide: RouteService, useValue: mockRouteService },
           { provide: AuthorizationDataService, useValue: authorizationService },
-          { provide: ResearcherProfileDataService, useValue: {} }
+          { provide: ResearcherProfileDataService, useValue: {} },
+          { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
         ],
 
         schemas: [NO_ERRORS_SCHEMA]
@@ -444,7 +451,7 @@ describe('ItemComponent', () => {
           { provide: SearchService, useValue: {} },
           { provide: RouteService, useValue: mockRouteService },
           { provide: AuthorizationDataService, useValue: {} },
-          { provide: ResearcherProfileDataService, useValue: {} }
+          { provide: ResearcherProfileDataService, useValue: {} },
         ],
         schemas: [NO_ERRORS_SCHEMA]
       }).overrideComponent(ItemComponent, {
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index fcbc46422d..70bbf39bac 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -12,12 +12,7 @@
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
index 3581694a5e..4b7da40abe 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
@@ -37,6 +37,10 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import {
+  BrowseDefinitionDataServiceStub
+} from '../../../../shared/testing/browse-definition-data-service.stub';
 
 const noMetadata = new MetadataMap();
 
@@ -90,7 +94,8 @@ describe('UntypedItemComponent', () => {
         { provide: SearchService, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: ItemVersionsSharedService, useValue: {} },
-        { provide: RouteService, useValue: mockRouteService }
+        { provide: RouteService, useValue: mockRouteService },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(UntypedItemComponent, {
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index 3ce33dc90a..ead62008de 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../versioned-item/versioned-item.component';
+import { ItemComponent } from '../shared/item.component';
 
 /**
  * Component that represents a publication Item page
@@ -15,6 +15,6 @@ import { VersionedItemComponent } from '../versioned-item/versioned-item.compone
   templateUrl: './untyped-item.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class UntypedItemComponent extends VersionedItemComponent {
+export class UntypedItemComponent extends ItemComponent {
 
 }
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts
deleted file mode 100644
index fcd82ce678..0000000000
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { VersionedItemComponent } from './versioned-item.component';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
-import { Item } from '../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { MetadataMap } from '../../../../core/shared/metadata.models';
-import { createRelationshipsObservable, mockRouteService } from '../shared/item.component.spec';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Component } from '@angular/core';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { ItemDataService } from '../../../../core/data/item-data.service';
-import { Version } from '../../../../core/shared/version.model';
-import { RouteService } from '../../../../core/services/route.service';
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { ItemSharedModule } from '../../../item-shared.module';
-
-const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
-  metadata: new MetadataMap(),
-  relationships: createRelationshipsObservable(),
-  _links: {
-    self: {
-      href: 'item-href'
-    },
-    version: {
-      href: 'version-href'
-    }
-  }
-});
-
-
-@Component({template: ''})
-class DummyComponent {
-}
-
-describe('VersionedItemComponent', () => {
-  let component: VersionedItemComponent;
-  let fixture: ComponentFixture<VersionedItemComponent>;
-
-  let versionService: VersionDataService;
-  let versionHistoryService: VersionHistoryDataService;
-
-  const versionServiceSpy = jasmine.createSpyObj('versionService', {
-    findByHref: createSuccessfulRemoteDataObject$<Version>(new Version()),
-  });
-
-  const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService', {
-    createVersion: createSuccessfulRemoteDataObject$<Version>(new Version()),
-  });
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [VersionedItemComponent, DummyComponent],
-      imports: [
-        RouterTestingModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock,
-          }
-        }),
-        ItemSharedModule,
-      ],
-      providers: [
-        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
-        { provide: VersionDataService, useValue: versionServiceSpy },
-        { provide: NotificationsService, useValue: {} },
-        { provide: ItemVersionsSharedService, useValue: {} },
-        { provide: WorkspaceitemDataService, useValue: {} },
-        { provide: SearchService, useValue: {} },
-        { provide: ItemDataService, useValue: {} },
-        { provide: RouteService, useValue: mockRouteService }
-      ]
-    }).compileComponents();
-    versionService = TestBed.inject(VersionDataService);
-    versionHistoryService = TestBed.inject(VersionHistoryDataService);
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(VersionedItemComponent);
-    component = fixture.componentInstance;
-    component.object = mockItem;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  describe('when onCreateNewVersion() is called', () => {
-    it('should call versionService.findByHref', () => {
-      component.onCreateNewVersion();
-      expect(versionService.findByHref).toHaveBeenCalledWith('version-href');
-    });
-  });
-
-});
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
deleted file mode 100644
index a1f4cebd77..0000000000
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { Component } from '@angular/core';
-import { ItemComponent } from '../shared/item.component';
-import { ItemVersionsSummaryModalComponent } from '../../../versions/item-versions-summary-modal/item-versions-summary-modal.component';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { Version } from '../../../../core/shared/version.model';
-import { switchMap, tap } from 'rxjs/operators';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { TranslateService } from '@ngx-translate/core';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
-import { Router } from '@angular/router';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { Item } from '../../../../core/shared/item.model';
-import { ItemDataService } from '../../../../core/data/item-data.service';
-import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { RouteService } from '../../../../core/services/route.service';
-
-@Component({
-  selector: 'ds-versioned-item',
-  templateUrl: './versioned-item.component.html',
-  styleUrls: ['./versioned-item.component.scss']
-})
-export class VersionedItemComponent extends ItemComponent {
-
-  constructor(
-    private modalService: NgbModal,
-    private versionHistoryService: VersionHistoryDataService,
-    private translateService: TranslateService,
-    private versionService: VersionDataService,
-    private itemVersionShared: ItemVersionsSharedService,
-    protected router: Router,
-    private workspaceItemDataService: WorkspaceitemDataService,
-    private searchService: SearchService,
-    private itemService: ItemDataService,
-    protected routeService: RouteService,
-  ) {
-    super(routeService, router);
-  }
-
-  /**
-   * Open a modal that allows to create a new version starting from the specified item, with optional summary
-   */
-  onCreateNewVersion(): void {
-
-    const item = this.object;
-    const versionHref = item._links.version.href;
-
-    // Open modal
-    const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent);
-
-    // Show current version in modal
-    this.versionService.findByHref(versionHref).pipe(getFirstCompletedRemoteData()).subscribe((res: RemoteData<Version>) => {
-      // if res.hasNoContent then the item is unversioned
-      activeModal.componentInstance.firstVersion = res.hasNoContent;
-      activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version);
-    });
-
-    // On createVersionEvent emitted create new version and notify
-    activeModal.componentInstance.createVersionEvent.pipe(
-      switchMap((summary: string) => this.versionHistoryService.createVersion(item._links.self.href, summary)),
-      getFirstCompletedRemoteData(),
-      // close model (should be displaying loading/waiting indicator) when version creation failed/succeeded
-      tap(() => activeModal.close()),
-      // show success/failure notification
-      tap((res: RemoteData<Version>) => { this.itemVersionShared.notifyCreateNewVersion(res); }),
-      // get workspace item
-      getFirstSucceededRemoteDataPayload<Version>(),
-      switchMap((newVersion: Version) => this.itemService.findByHref(newVersion._links.item.href)),
-      getFirstSucceededRemoteDataPayload<Item>(),
-      switchMap((newVersionItem: Item) => this.workspaceItemDataService.findByItem(newVersionItem.uuid, true, false)),
-      getFirstSucceededRemoteDataPayload<WorkspaceItem>(),
-    ).subscribe((wsItem) => {
-      const wsiId = wsItem.id;
-      const route = 'workspaceitems/' + wsiId + '/edit';
-      this.router.navigateByUrl(route);
-    });
-
-  }
-}
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
index 54420721b8..180eaaa2be 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
@@ -11,6 +11,8 @@ import { MetadataValue } from '../../../core/shared/metadata.models';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../shared/testing/browse-definition-data-service.stub';
 
 const itemType = 'Person';
 const metadataFields = ['dc.contributor.author', 'dc.creator'];
@@ -104,7 +106,8 @@ describe('MetadataRepresentationListComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [MetadataRepresentationListComponent, VarDirective],
       providers: [
-        { provide: RelationshipDataService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(MetadataRepresentationListComponent, {
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index 16dcf72cd4..d5e6547778 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -8,6 +8,13 @@ import { RelationshipDataService } from '../../../core/data/relationship-data.se
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { Item } from '../../../core/shared/item.model';
 import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
+import { map } from 'rxjs/operators';
+import { getRemoteDataPayload } from '../../../core/shared/operators';
+import {
+  MetadatumRepresentation
+} from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { BrowseService } from '../../../core/browse/browse.service';
+import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service';
 
 @Component({
   selector: 'ds-metadata-representation-list',
@@ -52,7 +59,8 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
    */
   total: number;
 
-  constructor(public relationshipService: RelationshipDataService) {
+  constructor(public relationshipService: RelationshipDataService,
+              private browseDefinitionDataService: BrowseDefinitionDataService) {
     super();
   }
 
@@ -76,7 +84,21 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
       ...metadata
         .slice((this.objects.length * this.incrementBy), (this.objects.length * this.incrementBy) + this.incrementBy)
         .map((metadatum: any) => Object.assign(new MetadataValue(), metadatum))
-        .map((metadatum: MetadataValue) => this.relationshipService.resolveMetadataRepresentation(metadatum, this.parentItem, this.itemType)),
+        .map((metadatum: MetadataValue) => {
+          if (metadatum.isVirtual) {
+            return this.relationshipService.resolveMetadataRepresentation(metadatum, this.parentItem, this.itemType);
+          } else {
+            // Check for a configured browse link and return a standard metadata representation
+            let searchKeyArray: string[] = [];
+            this.metadataFields.forEach((field: string) => {
+              searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field));
+            });
+            return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe(
+              getRemoteDataPayload(),
+              map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum))
+            );
+          }
+        }),
     );
   }
 }
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index eb13e3ec8b..3ec1df85fd 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -607,6 +607,18 @@ export class MenuResolver implements Resolve<boolean> {
           icon: 'user-check',
           index: 11
         },
+        {
+          id: 'system_wide_alert',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.system-wide-alert',
+            link: '/admin/system-wide-alert'
+          } as LinkMenuItemModel,
+          icon: 'exclamation-circle',
+          index: 12
+        },
       ];
 
       menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index d04c22e60a..b502326164 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -6,6 +6,7 @@
     (mouseenter)="activateSection($event)"
     (mouseleave)="deactivateSection($event)">
     <a href="javascript:void(0);" class="nav-link dropdown-toggle" routerLinkActive="active"
+       [class.disabled]="section.model?.disabled"
        id="browseDropdown" (click)="toggleSection($event)"
        data-toggle="dropdown">
         <ng-container
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index cc0ce4c782..ed79b1d2d1 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -2,6 +2,10 @@
     <h2>{{MESSAGE_PREFIX + '.header'|translate}}</h2>
     <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
 
+    <p *ngIf="validMailDomains.length != 0 && typeRequest === TYPE_REQUEST_REGISTER">
+      {{ MESSAGE_PREFIX + '.info.maildomain' | translate}} {{ validMailDomains.join(', ')}}
+    </p>
+
     <form [class]="'ng-invalid'" [formGroup]="form">
 
         <div class="form-group">
@@ -16,8 +20,11 @@
                     <span *ngIf="email.errors && email.errors.required">
                         {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
                     </span>
-                    <span *ngIf="email.errors && email.errors.pattern">
-                        {{ MESSAGE_PREFIX + '.email.error.pattern' | translate }}
+                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)">
+                        {{ MESSAGE_PREFIX + '.email.error.not-email-form' | translate }}
+                        <ng-container *ngIf="validMailDomains.length > 0">
+                          {{ MESSAGE_PREFIX + '.email.error.not-valid-domain' | translate: { domains: validMailDomains.join(', ') } }}
+                        </ng-container>
                     </span>
                     </div>
                 </div>
@@ -53,5 +60,4 @@
     </ng-template>
     </form>
 
-
 </div>
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
index cf3b4b13d2..6136db4aec 100644
--- a/src/app/register-email-form/register-email-form.component.spec.ts
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -12,14 +12,19 @@ import { EpersonRegistrationService } from '../core/data/eperson-registration.se
 import { By } from '@angular/platform-browser';
 import { RouterStub } from '../shared/testing/router.stub';
 import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
-import { RegisterEmailFormComponent } from './register-email-form.component';
+import {
+  RegisterEmailFormComponent,
+  TYPE_REQUEST_REGISTER,
+  TYPE_REQUEST_FORGOT
+} from './register-email-form.component';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { GoogleRecaptchaService } from '../core/google-recaptcha/google-recaptcha.service';
 import { CookieService } from '../core/services/cookie.service';
 import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 
-describe('RegisterEmailComponent', () => {
+describe('RegisterEmailFormComponent', () => {
 
   let comp: RegisterEmailFormComponent;
   let fixture: ComponentFixture<RegisterEmailFormComponent>;
@@ -53,6 +58,8 @@ describe('RegisterEmailComponent', () => {
       registerEmail: createSuccessfulRemoteDataObject$({})
     });
 
+    jasmine.getEnv().allowRespy(true);
+
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
       declarations: [RegisterEmailFormComponent],
@@ -95,17 +102,53 @@ describe('RegisterEmailComponent', () => {
       comp.form.patchValue({email: 'valid@email.org'});
       expect(comp.form.invalid).toBeFalse();
     });
+    it('should accept email with other domain names on TYPE_REQUEST_FORGOT form', () => {
+      spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+        name: 'authentication-password.domain.valid',
+        values: ['marvel.com'],
+      })));
+      comp.typeRequest = TYPE_REQUEST_FORGOT;
+
+      comp.ngOnInit();
+
+      comp.form.patchValue({ email: 'valid@email.org' });
+      expect(comp.form.invalid).toBeFalse();
+    });
     it('should be valid when uppercase letters are used', () => {
       comp.form.patchValue({email: 'VALID@email.org'});
       expect(comp.form.invalid).toBeFalse();
     });
+    it('should not accept email with other domain names', () => {
+      spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+        name: 'authentication-password.domain.valid',
+        values: ['marvel.com'],
+      })));
+      comp.typeRequest = TYPE_REQUEST_REGISTER;
+
+      comp.ngOnInit();
+
+      comp.form.patchValue({ email: 'valid@email.org' });
+      expect(comp.form.invalid).toBeTrue();
+    });
+    it('should accept email with the given domain name', () => {
+      spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+        name: 'authentication-password.domain.valid',
+        values: ['marvel.com'],
+      })));
+      comp.typeRequest = TYPE_REQUEST_REGISTER;
+
+      comp.ngOnInit();
+
+      comp.form.patchValue({ email: 'thor.odinson@marvel.com' });
+      expect(comp.form.invalid).toBeFalse();
+    });
   });
   describe('register', () => {
     it('should send a registration to the service and on success display a message and return to home', () => {
       comp.form.patchValue({email: 'valid@email.org'});
 
       comp.register();
-      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org');
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', null, null);
       expect(notificationsService.success).toHaveBeenCalled();
       expect(router.navigate).toHaveBeenCalledWith(['/home']);
     });
@@ -115,7 +158,7 @@ describe('RegisterEmailComponent', () => {
       comp.form.patchValue({email: 'valid@email.org'});
 
       comp.register();
-      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org');
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', null, null);
       expect(notificationsService.error).toHaveBeenCalled();
       expect(router.navigate).not.toHaveBeenCalled();
     });
@@ -133,7 +176,7 @@ describe('RegisterEmailComponent', () => {
       comp.form.patchValue({email: 'valid@email.org'});
       comp.register();
       tick();
-      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', 'googleRecaptchaToken');
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', 'googleRecaptchaToken', null);
       expect(notificationsService.success).toHaveBeenCalled();
       expect(router.navigate).toHaveBeenCalledWith(['/home']);
     }));
@@ -144,7 +187,7 @@ describe('RegisterEmailComponent', () => {
 
       comp.register();
       tick();
-      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', 'googleRecaptchaToken');
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', 'googleRecaptchaToken', null);
       expect(notificationsService.error).toHaveBeenCalled();
       expect(router.navigate).not.toHaveBeenCalled();
     }));
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 561bd53e67..9f0b186d39 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -1,21 +1,25 @@
-import { ChangeDetectorRef, Component, Input, OnInit, Optional } from '@angular/core';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { Router } from '@angular/router';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { Registration } from '../core/shared/registration.model';
-import { RemoteData } from '../core/data/remote-data';
-import { ConfigurationDataService } from '../core/data/configuration-data.service';
-import { getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
-import { ConfigurationProperty } from '../core/shared/configuration-property.model';
-import { isNotEmpty } from '../shared/empty.util';
-import { BehaviorSubject, combineLatest, Observable, of, switchMap } from 'rxjs';
-import { map, startWith, take } from 'rxjs/operators';
-import { CAPTCHA_NAME, GoogleRecaptchaService } from '../core/google-recaptcha/google-recaptcha.service';
-import { AlertType } from '../shared/alert/aletr-type';
-import { KlaroService } from '../shared/cookies/klaro.service';
-import { CookieService } from '../core/services/cookie.service';
+import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit, Optional } from '@angular/core';
+import {EpersonRegistrationService} from '../core/data/eperson-registration.service';
+import {NotificationsService} from '../shared/notifications/notifications.service';
+import {TranslateService} from '@ngx-translate/core';
+import {Router} from '@angular/router';
+import { FormBuilder, FormControl, FormGroup, Validators, ValidatorFn } from '@angular/forms';
+import {Registration} from '../core/shared/registration.model';
+import {RemoteData} from '../core/data/remote-data';
+import {ConfigurationDataService} from '../core/data/configuration-data.service';
+import { getAllSucceededRemoteDataPayload, getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
+import {ConfigurationProperty} from '../core/shared/configuration-property.model';
+import {isNotEmpty} from '../shared/empty.util';
+import {BehaviorSubject, combineLatest, Observable, of, switchMap} from 'rxjs';
+import {map, startWith, take} from 'rxjs/operators';
+import {CAPTCHA_NAME, GoogleRecaptchaService} from '../core/google-recaptcha/google-recaptcha.service';
+import {AlertType} from '../shared/alert/aletr-type';
+import {KlaroService} from '../shared/cookies/klaro.service';
+import {CookieService} from '../core/services/cookie.service';
+import { Subscription } from 'rxjs';
+
+export const TYPE_REQUEST_FORGOT = 'forgot';
+export const TYPE_REQUEST_REGISTER = 'register';
 
 @Component({
   selector: 'ds-register-email-form',
@@ -24,7 +28,7 @@ import { CookieService } from '../core/services/cookie.service';
 /**
  * Component responsible to render an email registration form.
  */
-export class RegisterEmailFormComponent implements OnInit {
+export class RegisterEmailFormComponent implements OnDestroy, OnInit {
 
   /**
    * The form containing the mail address
@@ -37,6 +41,12 @@ export class RegisterEmailFormComponent implements OnInit {
   @Input()
   MESSAGE_PREFIX: string;
 
+  /**
+   * Type of register request to be done, register new email or forgot password (same endpoint)
+   */
+  @Input()
+  typeRequest: string = null;
+
   public AlertTypeEnum = AlertType;
 
   /**
@@ -51,6 +61,11 @@ export class RegisterEmailFormComponent implements OnInit {
 
   disableUntilChecked = true;
 
+  validMailDomains: string[];
+  TYPE_REQUEST_REGISTER = TYPE_REQUEST_REGISTER;
+
+  subscriptions: Subscription[] = [];
+
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();
   }
@@ -72,31 +87,54 @@ export class RegisterEmailFormComponent implements OnInit {
     private changeDetectorRef: ChangeDetectorRef,
     private notificationsService: NotificationsService,
   ) {
+  }
 
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((sub: Subscription) => sub.unsubscribe());
   }
 
   ngOnInit(): void {
+    const validators: ValidatorFn[] = [
+      Validators.required,
+      Validators.email,
+      // Regex pattern borrowed from HTML5 specs for a valid email address:
+      // https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
+      Validators.pattern('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$')
+    ];
     this.form = this.formBuilder.group({
       email: new FormControl('', {
-        validators: [Validators.required,
-          // Regex pattern borrowed from HTML5 specs for a valid email address:
-          // https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
-          Validators.pattern('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$')
-        ],
+        validators: validators,
       })
     });
-    this.configService.findByPropertyName('registration.verification.enabled').pipe(
+    this.validMailDomains = [];
+    if (this.typeRequest === TYPE_REQUEST_REGISTER) {
+      this.subscriptions.push(this.configService.findByPropertyName('authentication-password.domain.valid')
+        .pipe(getAllSucceededRemoteDataPayload())
+        .subscribe((remoteData: ConfigurationProperty) => {
+          this.validMailDomains = remoteData.values;
+          for (const remoteValue of remoteData.values) {
+            if (this.validMailDomains.length !== 0) {
+              this.form.get('email').setValidators([
+                ...validators,
+                Validators.pattern(this.validMailDomains.map((domain: string) => '(^.*' + domain.replace(new RegExp('\\.', 'g'), '\\.') + '$)').join('|')),
+              ]);
+              this.form.updateValueAndValidity();
+            }
+          }
+          this.changeDetectorRef.detectChanges();
+        }));
+    }
+    this.subscriptions.push(this.configService.findByPropertyName('registration.verification.enabled').pipe(
       getFirstSucceededRemoteDataPayload(),
       map((res: ConfigurationProperty) => res?.values[0].toLowerCase() === 'true')
     ).subscribe((res: boolean) => {
       this.registrationVerification = res;
-    });
+    }));
 
-    this.disableUntilCheckedFcn().subscribe((res) => {
+    this.subscriptions.push(this.disableUntilCheckedFcn().subscribe((res) => {
       this.disableUntilChecked = res;
       this.changeDetectorRef.detectChanges();
-    });
-
+    }));
   }
 
   /**
@@ -112,7 +150,7 @@ export class RegisterEmailFormComponent implements OnInit {
   register(tokenV2?) {
     if (!this.form.invalid) {
       if (this.registrationVerification) {
-        combineLatest([this.captchaVersion(), this.captchaMode()]).pipe(
+        this.subscriptions.push(combineLatest([this.captchaVersion(), this.captchaMode()]).pipe(
           switchMap(([captchaVersion, captchaMode])  => {
             if (captchaVersion === 'v3') {
               return this.googleRecaptchaService.getRecaptchaToken('register_email');
@@ -134,7 +172,7 @@ export class RegisterEmailFormComponent implements OnInit {
               this.showNotification('error');
             }
           }
-        );
+        ));
       } else {
         this.registration();
       }
@@ -146,18 +184,20 @@ export class RegisterEmailFormComponent implements OnInit {
    */
   registration(captchaToken = null) {
     let registerEmail$ = captchaToken ?
-      this.epersonRegistrationService.registerEmail(this.email.value, captchaToken) :
-      this.epersonRegistrationService.registerEmail(this.email.value);
-    registerEmail$.subscribe((response: RemoteData<Registration>) => {
+      this.epersonRegistrationService.registerEmail(this.email.value, captchaToken, this.typeRequest) :
+      this.epersonRegistrationService.registerEmail(this.email.value, null, this.typeRequest);
+    this.subscriptions.push(registerEmail$.subscribe((response: RemoteData<Registration>) => {
       if (response.hasSucceeded) {
         this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`),
           this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value}));
         this.router.navigate(['/home']);
+        } else if (response.statusCode === 422) {
+        this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.error.maildomain`, {domains: this.validMailDomains.join(', ')}));
       } else {
         this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`),
           this.translateService.get(`${this.MESSAGE_PREFIX}.error.content`, {email: this.email.value}));
       }
-    });
+    }));
   }
 
   /**
diff --git a/src/app/register-page/register-email/register-email.component.html b/src/app/register-page/register-email/register-email.component.html
index a60dc4c31e..1829bb2914 100644
--- a/src/app/register-page/register-email/register-email.component.html
+++ b/src/app/register-page/register-email/register-email.component.html
@@ -1,3 +1,3 @@
 <ds-register-email-form
-        [MESSAGE_PREFIX]="'register-page.registration'">
+        [MESSAGE_PREFIX]="'register-page.registration'" [typeRequest]="typeRequest">
 </ds-register-email-form>
diff --git a/src/app/register-page/register-email/register-email.component.ts b/src/app/register-page/register-email/register-email.component.ts
index 7b7b0f631b..228e8c56a0 100644
--- a/src/app/register-page/register-email/register-email.component.ts
+++ b/src/app/register-page/register-email/register-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { TYPE_REQUEST_REGISTER } from '../../register-email-form/register-email-form.component';
 
 @Component({
   selector: 'ds-register-email',
@@ -9,5 +10,5 @@ import { Component } from '@angular/core';
  * Component responsible the email registration step when registering as a new user
  */
 export class RegisterEmailComponent {
-
+  typeRequest = TYPE_REQUEST_REGISTER;
 }
diff --git a/src/app/root.module.ts b/src/app/root.module.ts
index 9023290891..a8af0ef5b5 100644
--- a/src/app/root.module.ts
+++ b/src/app/root.module.ts
@@ -43,11 +43,13 @@ import {
 import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
 import { PageErrorComponent } from './page-error/page-error.component';
 import { ContextHelpToggleComponent } from './header/context-help-toggle/context-help-toggle.component';
+import { SystemWideAlertModule } from './system-wide-alert/system-wide-alert.module';
 
 const IMPORTS = [
   CommonModule,
   SharedModule.withEntryComponents(),
   NavbarModule,
+  SystemWideAlertModule,
   NgbModule,
 ];
 
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index 7cb1365b2b..bf49e507c0 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -4,6 +4,7 @@
     }">
   <ds-themed-admin-sidebar></ds-themed-admin-sidebar>
   <div class="inner-wrapper">
+    <ds-system-wide-alert-banner></ds-system-wide-alert-banner>
     <ds-themed-header-navbar-wrapper></ds-themed-header-navbar-wrapper>
     <main class="main-content">
       <ds-themed-breadcrumbs></ds-themed-breadcrumbs>
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index 40433fc619..d5f3d8d615 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -1,9 +1,6 @@
 input[type="text"] {
   margin-top: calc(-0.5 * var(--bs-font-size-base));
-
-  &:focus {
-    background-color: rgba(255, 255, 255, 0.5) !important;
-  }
+  background-color: #fff !important;
 
   &.collapsed {
     opacity: 0;
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index c5bb40cf1b..e170d522b5 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -61,8 +61,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
 
   parsedContent$: Observable<ParsedContent>;
 
-  private subs: {always: Subscription[], tooltipBound: Subscription[]}
-    = {always: [], tooltipBound: []};
+  private subs: Subscription[] = [];
 
   constructor(
     private translateService: TranslateService,
@@ -78,14 +77,13 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
         dontParseLinks ? [text] : this.parseLinks(text))
     );
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
-    this.subs.always = [this.parsedContent$.subscribe(), this.shouldShowIcon$.subscribe()];
   }
 
   @ViewChild('tooltip', { static: false }) set setTooltip(tooltip: NgbTooltip) {
     this.tooltip = tooltip;
-    this.clearSubs('tooltipBound');
+    this.clearSubs();
     if (this.tooltip !== undefined) {
-      this.subs.tooltipBound = [
+      this.subs = [
         this.contextHelpService.getContextHelp$(this.id)
           .pipe(hasValueOperator())
           .subscribe((ch: ContextHelp) => {
@@ -159,13 +157,8 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
     });
   }
 
-  private clearSubs(filter: null | 'tooltipBound' = null) {
-    if (filter === null) {
-      [].concat(...Object.values(this.subs)).forEach(sub => sub.unsubscribe());
-      this.subs = {always: [], tooltipBound: []};
-    } else {
-      this.subs[filter].forEach(sub => sub.unsubscribe());
-      this.subs[filter] = [];
-    }
+  private clearSubs() {
+    this.subs.forEach(sub => sub.unsubscribe());
+    this.subs = [];
   }
 }
diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts
new file mode 100644
index 0000000000..abfe618174
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts
@@ -0,0 +1,259 @@
+import { TestBed, waitForAsync } from '@angular/core/testing';
+import { MenuServiceStub } from '../testing/menu-service.stub';
+import { of as observableOf } from 'rxjs';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { AdminSidebarComponent } from '../../admin/admin-sidebar/admin-sidebar.component';
+import { MenuService } from '../menu/menu.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { DSOEditMenuResolver } from './dso-edit-menu.resolver';
+import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { Item } from '../../core/shared/item.model';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { MenuID } from '../menu/menu-id.model';
+import { MenuItemType } from '../menu/menu-item-type.model';
+import { TextMenuItemModel } from '../menu/menu-item/models/text.model';
+import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
+import { NotificationsService } from '../notifications/notifications.service';
+
+describe('DSOEditMenuResolver', () => {
+
+  const MENU_STATE = {
+    id: 'some menu'
+  };
+
+  let resolver: DSOEditMenuResolver;
+
+  let dSpaceObjectDataService;
+  let menuService;
+  let authorizationService;
+  let dsoVersioningModalService;
+  let researcherProfileService;
+  let notificationsService;
+  let translate;
+
+  const route = {
+    data: {
+      menu: {
+        'statistics': [{
+          id: 'statistics-dummy-1',
+          active: false,
+          visible: true,
+          model: null
+        }]
+      }
+    },
+    params: {id: 'test-uuid'},
+  };
+
+  const state = {
+    url: 'test-url'
+  };
+
+  const testObject = Object.assign(new Item(), {uuid: 'test-uuid', type: 'item', _links: {self: {href: 'self-link'}}});
+
+  const dummySections1 = [{
+    id: 'dummy-1',
+    active: false,
+    visible: true,
+    model: null
+  },
+    {
+      id: 'dummy-2',
+      active: false,
+      visible: true,
+      model: null
+    }];
+
+  const dummySections2 = [{
+    id: 'dummy-3',
+    active: false,
+    visible: true,
+    model: null
+  },
+    {
+      id: 'dummy-4',
+      active: false,
+      visible: true,
+      model: null
+    },
+    {
+      id: 'dummy-5',
+      active: false,
+      visible: true,
+      model: null
+    }];
+
+  beforeEach(waitForAsync(() => {
+    menuService = new MenuServiceStub();
+    spyOn(menuService, 'getMenu').and.returnValue(observableOf(MENU_STATE));
+
+    dSpaceObjectDataService = jasmine.createSpyObj('dSpaceObjectDataService', {
+      findById: createSuccessfulRemoteDataObject$(testObject)
+    });
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
+    dsoVersioningModalService = jasmine.createSpyObj('dsoVersioningModalService', {
+      isNewVersionButtonDisabled: observableOf(false),
+      getVersioningTooltipMessage: observableOf('message'),
+      openCreateVersionModal: {}
+    });
+    researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
+      createFromExternalSourceAndReturnRelatedItemId: observableOf('mock-id'),
+    });
+    translate = jasmine.createSpyObj('translate', {
+      get: observableOf('translated-message'),
+    });
+    notificationsService = jasmine.createSpyObj('notificationsService', {
+      success: {},
+      error: {},
+    });
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
+      declarations: [AdminSidebarComponent],
+      providers: [
+        {provide: DSpaceObjectDataService, useValue: dSpaceObjectDataService},
+        {provide: MenuService, useValue: menuService},
+        {provide: AuthorizationDataService, useValue: authorizationService},
+        {provide: DsoVersioningModalService, useValue: dsoVersioningModalService},
+        {provide: ResearcherProfileDataService, useValue: researcherProfileService},
+        {provide: TranslateService, useValue: translate},
+        {provide: NotificationsService, useValue: notificationsService},
+        {
+          provide: NgbModal, useValue: {
+            open: () => {/*comment*/
+            }
+          }
+        }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    });
+    resolver = TestBed.inject(DSOEditMenuResolver);
+
+    spyOn(menuService, 'addSection');
+  }));
+
+  it('should be created', () => {
+    expect(resolver).toBeTruthy();
+  });
+
+  describe('resolve', () => {
+    it('should create all menus when a dso is found based on the route id param', (done) => {
+      spyOn(resolver, 'getDsoMenus').and.returnValue(
+        [observableOf(dummySections1), observableOf(dummySections2)]
+      );
+      resolver.resolve(route as any, null).subscribe(resolved => {
+        expect(resolved).toEqual(
+          {
+            ...route.data.menu,
+            [MenuID.DSO_EDIT]: [
+              ...dummySections1.map((menu) => Object.assign(menu, {id: menu.id + '-test-uuid'})),
+              ...dummySections2.map((menu) => Object.assign(menu, {id: menu.id + '-test-uuid'}))
+            ]
+          }
+        );
+        expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-uuid', true, false);
+        expect(resolver.getDsoMenus).toHaveBeenCalled();
+        done();
+      });
+    });
+    it('should create all menus when a dso is found based on the route scope query param when no id param is present', (done) => {
+      spyOn(resolver, 'getDsoMenus').and.returnValue(
+        [observableOf(dummySections1), observableOf(dummySections2)]
+      );
+      const routeWithScope = {
+        data: {
+          menu: {
+            'statistics': [{
+              id: 'statistics-dummy-1',
+              active: false,
+              visible: true,
+              model: null
+            }]
+          }
+        },
+        params: {},
+        queryParams: {scope: 'test-scope-uuid'},
+      };
+
+      resolver.resolve(routeWithScope as any, null).subscribe(resolved => {
+        expect(resolved).toEqual(
+          {
+            ...route.data.menu,
+            [MenuID.DSO_EDIT]: [
+              ...dummySections1.map((menu) => Object.assign(menu, {id: menu.id + '-test-scope-uuid'})),
+              ...dummySections2.map((menu) => Object.assign(menu, {id: menu.id + '-test-scope-uuid'}))
+            ]
+          }
+        );
+        expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-scope-uuid', true, false);
+        expect(resolver.getDsoMenus).toHaveBeenCalled();
+        done();
+      });
+    });
+    it('should return the statistics menu when no dso is found', (done) => {
+      (dSpaceObjectDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
+
+      resolver.resolve(route as any, null).subscribe(resolved => {
+        expect(resolved).toEqual(
+          {
+            ...route.data.menu
+          }
+        );
+        done();
+      });
+    });
+  });
+  describe('getDsoMenus', () => {
+    it('should return as first part the item version, orcid and claim list ', (done) => {
+      const result = resolver.getDsoMenus(testObject, route, state);
+      result[0].subscribe((menuList) => {
+        expect(menuList.length).toEqual(3);
+        expect(menuList[0].id).toEqual('orcid-dso');
+        expect(menuList[0].active).toEqual(false);
+        // Visible should be false due to the item not being of type person
+        expect(menuList[0].visible).toEqual(false);
+        expect(menuList[0].model.type).toEqual(MenuItemType.LINK);
+
+        expect(menuList[1].id).toEqual('version-dso');
+        expect(menuList[1].active).toEqual(false);
+        expect(menuList[1].visible).toEqual(true);
+        expect(menuList[1].model.type).toEqual(MenuItemType.ONCLICK);
+        expect((menuList[1].model as TextMenuItemModel).text).toEqual('message');
+        expect(menuList[1].model.disabled).toEqual(false);
+        expect(menuList[1].icon).toEqual('code-branch');
+
+        expect(menuList[2].id).toEqual('claim-dso');
+        expect(menuList[2].active).toEqual(false);
+        // Visible should be false due to the item not being of type person
+        expect(menuList[2].visible).toEqual(false);
+        expect(menuList[2].model.type).toEqual(MenuItemType.ONCLICK);
+        expect((menuList[2].model as TextMenuItemModel).text).toEqual('item.page.claim.button');
+        done();
+      });
+
+    });
+    it('should return as second part the common list ', (done) => {
+      const result = resolver.getDsoMenus(testObject, route, state);
+      result[1].subscribe((menuList) => {
+        expect(menuList.length).toEqual(1);
+        expect(menuList[0].id).toEqual('edit-dso');
+        expect(menuList[0].active).toEqual(false);
+        expect(menuList[0].visible).toEqual(true);
+        expect(menuList[0].model.type).toEqual(MenuItemType.LINK);
+        expect((menuList[0].model as LinkMenuItemModel).text).toEqual('item.page.edit');
+        expect((menuList[0].model as LinkMenuItemModel).link).toEqual('/items/test-uuid/edit/metadata');
+        expect(menuList[0].icon).toEqual('pencil-alt');
+        done();
+      });
+
+    });
+  });
+});
diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts
new file mode 100644
index 0000000000..749d5580a4
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts
@@ -0,0 +1,224 @@
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { combineLatest, Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { MenuService } from '../menu/menu.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { Injectable } from '@angular/core';
+import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';
+import { Item } from '../../core/shared/item.model';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { OnClickMenuItemModel } from '../menu/menu-item/models/onclick.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { map, switchMap } from 'rxjs/operators';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service';
+import { hasNoValue, hasValue, isNotEmpty } from '../empty.util';
+import { MenuID } from '../menu/menu-id.model';
+import { MenuItemType } from '../menu/menu-item-type.model';
+import { MenuSection } from '../menu/menu-section.model';
+import { getDSORoute } from '../../app-routing-paths';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
+import { NotificationsService } from '../notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+
+/**
+ * Creates the menus for the dspace object pages
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection[] }> {
+
+  constructor(
+    protected dSpaceObjectDataService: DSpaceObjectDataService,
+    protected menuService: MenuService,
+    protected authorizationService: AuthorizationDataService,
+    protected modalService: NgbModal,
+    protected dsoVersioningModalService: DsoVersioningModalService,
+    protected researcherProfileService: ResearcherProfileDataService,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+  ) {
+  }
+
+  /**
+   * Initialise all dspace object related menus
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ [key: string]: MenuSection[] }> {
+    let id = route.params.id;
+    if (hasNoValue(id) && hasValue(route.queryParams.scope)) {
+      id = route.queryParams.scope;
+    }
+    return this.dSpaceObjectDataService.findById(id, true, false).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((dsoRD) => {
+        if (dsoRD.hasSucceeded) {
+          const dso = dsoRD.payload;
+          return combineLatest(this.getDsoMenus(dso, route, state)).pipe(
+            // Menu sections are retrieved as an array of arrays and flattened into a single array
+            map((combinedMenus) => [].concat.apply([], combinedMenus)),
+            map((menus) => this.addDsoUuidToMenuIDs(menus, dso)),
+            map((menus) => {
+              return {
+                ...route.data?.menu,
+                [MenuID.DSO_EDIT]: menus
+              };
+            })
+          );
+        } else {
+          return observableOf({...route.data?.menu});
+        }
+      })
+    );
+  }
+
+  /**
+   * Return all the menus for a dso based on the route and state
+   */
+  getDsoMenus(dso, route, state): Observable<MenuSection[]>[] {
+    return [
+      this.getItemMenu(dso),
+      this.getCommonMenu(dso, state)
+    ];
+  }
+
+  /**
+   * Get the common menus between all dspace objects
+   */
+  protected getCommonMenu(dso, state): Observable<MenuSection[]> {
+    return combineLatest([
+      this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, dso.self),
+    ]).pipe(
+      map(([canEditItem]) => {
+        return [
+          {
+            id: 'edit-dso',
+            active: false,
+            visible: canEditItem,
+            model: {
+              type: MenuItemType.LINK,
+              text: this.getDsoType(dso) + '.page.edit',
+              link: new URLCombiner(getDSORoute(dso), 'edit', 'metadata').toString()
+            } as LinkMenuItemModel,
+            icon: 'pencil-alt',
+            index: 2
+          },
+        ];
+      })
+    );
+  }
+
+  /**
+   * Get item specific menus
+   */
+  protected getItemMenu(dso): Observable<MenuSection[]> {
+    if (dso instanceof Item) {
+      return combineLatest([
+        this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, dso.self),
+        this.dsoVersioningModalService.isNewVersionButtonDisabled(dso),
+        this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'),
+        this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self),
+        this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self),
+      ]).pipe(
+        map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem]) => {
+          const isPerson = this.getDsoType(dso) === 'person';
+          return [
+            {
+              id: 'orcid-dso',
+              active: false,
+              visible: isPerson && canSynchronizeWithOrcid,
+              model: {
+                type: MenuItemType.LINK,
+                text: 'item.page.orcid.tooltip',
+                link: new URLCombiner(getDSORoute(dso), 'orcid').toString()
+              } as LinkMenuItemModel,
+              icon: 'orcid fab fa-lg',
+              index: 0
+            },
+            {
+              id: 'version-dso',
+              active: false,
+              visible: canCreateVersion,
+              model: {
+                type: MenuItemType.ONCLICK,
+                text: versionTooltip,
+                disabled: disableVersioning,
+                function: () => {
+                  this.dsoVersioningModalService.openCreateVersionModal(dso);
+                }
+              } as OnClickMenuItemModel,
+              icon: 'code-branch',
+              index: 1
+            },
+            {
+              id: 'claim-dso',
+              active: false,
+              visible: isPerson && canClaimItem,
+              model: {
+                type: MenuItemType.ONCLICK,
+                text: 'item.page.claim.button',
+                function: () => {
+                  this.claimResearcher(dso);
+                }
+              } as OnClickMenuItemModel,
+              icon: 'hand-paper',
+              index: 3
+            },
+          ];
+        }),
+      );
+    } else {
+      return observableOf([]);
+    }
+  }
+
+  /**
+   * Claim a researcher by creating a profile
+   * Shows notifications and/or hides the menu section on success/error
+   */
+  protected claimResearcher(dso) {
+    this.researcherProfileService.createFromExternalSourceAndReturnRelatedItemId(dso.self)
+      .subscribe((id: string) => {
+        if (isNotEmpty(id)) {
+          this.notificationsService.success(this.translate.get('researcherprofile.success.claim.title'),
+            this.translate.get('researcherprofile.success.claim.body'));
+          this.authorizationService.invalidateAuthorizationsRequestCache();
+          this.menuService.hideMenuSection(MenuID.DSO_EDIT, 'claim-dso-' + dso.uuid);
+        } else {
+          this.notificationsService.error(
+            this.translate.get('researcherprofile.error.claim.title'),
+            this.translate.get('researcherprofile.error.claim.body'));
+        }
+      });
+  }
+
+  /**
+   * Retrieve the dso or entity type for an object to be used in generic messages
+   */
+  protected getDsoType(dso) {
+    const renderType = dso.getRenderTypes()[0];
+    if (typeof renderType === 'string' || renderType instanceof String) {
+      return renderType.toLowerCase();
+    } else {
+      return dso.type.toString().toLowerCase();
+    }
+  }
+
+  /**
+   * Add the dso uuid to all provided menu ids and parent ids
+   */
+  protected addDsoUuidToMenuIDs(menus, dso) {
+    return menus.map((menu) => {
+      Object.assign(menu, {
+        id: menu.id + '-' + dso.uuid
+      });
+      if (hasValue(menu.parentID)) {
+        Object.assign(menu, {
+          parentID: menu.parentID + '-' + dso.uuid
+        });
+      }
+      return menu;
+    });
+  }
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
new file mode 100644
index 0000000000..cb725e7d70
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -0,0 +1,23 @@
+<div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
+    <div class="d-flex flex-row flex-nowrap"
+         [ngbTooltip]="itemModel.text | translate">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [disabled]="section.model?.disabled">
+            <i class="fas fa-{{section.icon}} fa-fw"></i>
+        </button>
+        <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
+            <li class="nav-item nav-link d-flex flex-row" *ngFor="let subSection of (subSections$ | async)">
+                <div *ngIf="renderIcons$ | async" class="mr-2">
+                    <i *ngIf="subSection.icon; else spacer" class="fas fa-{{subSection.icon}} fa-fw"></i>
+                    <ng-template #spacer><i class="fas fa-fw"></i></ng-template>
+                </div>
+                <ng-container
+                        *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;">
+                </ng-container>
+            </li>
+        </ul>
+    </div>
+</div>
+
+
+
+
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss
new file mode 100644
index 0000000000..b37f1be746
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss
@@ -0,0 +1,30 @@
+.btn-dark {
+    background-color: var(--ds-admin-sidebar-bg);
+}
+
+.dso-button-menu {
+    .dropdown-toggle::after {
+        display: none;
+    }
+}
+
+ul.dropdown-menu {
+    background-color: var(--ds-admin-sidebar-bg);
+    color: white;
+
+    ::ng-deep a {
+        color: white;
+
+        &.disabled {
+            color: var(--bs-btn-link-disabled-color);
+        }
+    }
+
+    .disabled {
+        color: var(--bs-btn-link-disabled-color);
+    }
+}
+
+.dso-edit-menu-dropdown {
+  max-width: calc(min(600px, 75vw));
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts
new file mode 100644
index 0000000000..79ab35bd28
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts
@@ -0,0 +1,75 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { MenuServiceStub } from '../../../testing/menu-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import { MenuService } from '../../../menu/menu.service';
+import { CSSVariableService } from '../../../sass-helper/css-variable.service';
+import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub';
+import { Router } from '@angular/router';
+import { RouterStub } from '../../../testing/router.stub';
+import { of as observableOf } from 'rxjs';
+import { Component } from '@angular/core';
+import { DsoEditMenuExpandableSectionComponent } from './dso-edit-menu-expandable-section.component';
+import { By } from '@angular/platform-browser';
+import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model';
+
+describe('DsoEditMenuExpandableSectionComponent', () => {
+  let component: DsoEditMenuExpandableSectionComponent;
+  let fixture: ComponentFixture<DsoEditMenuExpandableSectionComponent>;
+  const menuService = new MenuServiceStub();
+  const iconString = 'test';
+
+  const dummySection = {
+    id: 'dummy',
+    active: false,
+    visible: true,
+    model: {
+      type: MenuItemType.TEXT,
+      disabled: false,
+      text: 'text'
+    },
+    icon: iconString
+  };
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [DsoEditMenuExpandableSectionComponent, TestComponent],
+      providers: [
+        {provide: 'sectionDataProvider', useValue: dummySection},
+        {provide: MenuService, useValue: menuService},
+        {provide: CSSVariableService, useClass: CSSVariableServiceStub},
+        {provide: Router, useValue: new RouterStub()},
+      ]
+    }).overrideComponent(DsoEditMenuExpandableSectionComponent, {
+      set: {
+        entryComponents: [TestComponent]
+      }
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
+    fixture = TestBed.createComponent(DsoEditMenuExpandableSectionComponent);
+    component = fixture.componentInstance;
+    spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should show a button with the icon', () => {
+    const button = fixture.debugElement.query(By.css('.btn-dark'));
+    expect(button.nativeElement.innerHTML).toContain('fa-' + iconString);
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
new file mode 100644
index 0000000000..8e4a7008af
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -0,0 +1,49 @@
+import { Component, Inject, Injector } from '@angular/core';
+import { rendersSectionForMenu } from 'src/app/shared/menu/menu-section.decorator';
+import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
+import { MenuService } from '../../../menu/menu.service';
+import { Router } from '@angular/router';
+import { MenuID } from 'src/app/shared/menu/menu-id.model';
+import { MenuSection } from 'src/app/shared/menu/menu-section.model';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { hasValue } from '../../../empty.util';
+
+/**
+ * Represents an expandable section in the dso edit menus
+ */
+@Component({
+  /* tslint:disable:component-selector */
+  selector: 'ds-dso-edit-menu-expandable-section',
+  templateUrl: './dso-edit-menu-expandable-section.component.html',
+  styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
+})
+@rendersSectionForMenu(MenuID.DSO_EDIT, true)
+export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent {
+
+  menuID: MenuID = MenuID.DSO_EDIT;
+  itemModel;
+
+  renderIcons$: Observable<boolean>;
+
+  constructor(
+    @Inject('sectionDataProvider') menuSection: MenuSection,
+    protected menuService: MenuService,
+    protected injector: Injector,
+    protected router: Router,
+  ) {
+    super(menuSection, menuService, injector);
+    this.itemModel = menuSection.model;
+  }
+
+  ngOnInit(): void {
+    this.menuService.activateSection(this.menuID, this.section.id);
+    super.ngOnInit();
+
+    this.renderIcons$ = this.subSections$.pipe(
+      map((sections: MenuSection[]) => {
+        return sections.some(section => hasValue(section.icon));
+      }),
+    );
+  }
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
new file mode 100644
index 0000000000..16fda1caa8
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -0,0 +1,25 @@
+<div *ngIf="!canActivate" class="dso-button-menu mb-1"
+     [title]="itemModel.text | translate"
+     [ngbTooltip]="itemModel.text | translate">
+    <a *ngIf="!section.model.disabled" class="d-flex flex-row flex-nowrap"
+       [routerLink]="itemModel.link"
+       href="javascript:void(0);">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
+            <i class="fas fa-{{section.icon}} fa-fw"></i>
+        </button>
+    </a>
+    <div *ngIf="section.model.disabled" class="d-flex flex-row flex-nowrap">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
+            <i class="fas fa-{{section.icon}} fa-fw"></i>
+        </button>
+    </div>
+</div>
+
+<div *ngIf="canActivate" class="dso-button-menu mb-1"
+     [title]="itemModel.text | translate"
+     [ngbTooltip]="itemModel.text | translate">
+    <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
+            (click)="activate($event)">
+        <i class="fas fa-{{section.icon}} fa-fw"></i>
+    </button>
+</div>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.scss b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.scss
new file mode 100644
index 0000000000..cf0e81c553
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.scss
@@ -0,0 +1,3 @@
+.btn-dark {
+    background-color: var(--ds-admin-sidebar-bg);
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
new file mode 100644
index 0000000000..f0815c5415
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
@@ -0,0 +1,173 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { MenuServiceStub } from '../../../testing/menu-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import { MenuService } from '../../../menu/menu.service';
+import { CSSVariableService } from '../../../sass-helper/css-variable.service';
+import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub';
+import { Router } from '@angular/router';
+import { RouterStub } from '../../../testing/router.stub';
+import { of as observableOf } from 'rxjs';
+import { Component } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { DsoEditMenuSectionComponent } from './dso-edit-menu-section.component';
+import { OnClickMenuItemModel } from '../../../menu/menu-item/models/onclick.model';
+import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model';
+
+function initAsync(dummySectionText: { visible: boolean; icon: string; active: boolean; model: { disabled: boolean; text: string; type: MenuItemType }; id: string }, menuService: MenuServiceStub) {
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [DsoEditMenuSectionComponent, TestComponent],
+      providers: [
+        {provide: 'sectionDataProvider', useValue: dummySectionText},
+        {provide: MenuService, useValue: menuService},
+        {provide: CSSVariableService, useClass: CSSVariableServiceStub},
+        {provide: Router, useValue: new RouterStub()},
+      ]
+    }).overrideComponent(DsoEditMenuSectionComponent, {
+      set: {
+        entryComponents: [TestComponent]
+      }
+    })
+      .compileComponents();
+  }));
+}
+
+describe('DsoEditMenuSectionComponent', () => {
+  let component: DsoEditMenuSectionComponent;
+  let fixture: ComponentFixture<DsoEditMenuSectionComponent>;
+  const menuService = new MenuServiceStub();
+  const iconString = 'test';
+
+  const dummySectionText = {
+    id: 'dummy',
+    active: false,
+    visible: true,
+    model: {
+      type: MenuItemType.TEXT,
+      disabled: false,
+      text: 'text'
+    },
+    icon: iconString
+  };
+  const dummySectionLink = {
+    id: 'dummy',
+    active: false,
+    visible: true,
+    model: {
+      type: MenuItemType.LINK,
+      disabled: false,
+      text: 'text',
+      link: 'link'
+    },
+    icon: iconString
+  };
+
+  const dummySectionClick = {
+    id: 'dummy',
+    active: false,
+    visible: true,
+    model: {
+      type: MenuItemType.ONCLICK,
+      disabled: false,
+      text: 'text',
+      function: () => 'test'
+    },
+    icon: iconString
+  };
+
+  describe('text model', () => {
+    initAsync(dummySectionText, menuService);
+    beforeEach(() => {
+      spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
+      fixture = TestBed.createComponent(DsoEditMenuSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should show a button with the icon', () => {
+      const button = fixture.debugElement.query(By.css('.btn-dark'));
+      expect(button.nativeElement.innerHTML).toContain('fa-' + iconString);
+    });
+    describe('when the section model in a disabled link or text', () => {
+      it('should show just the button', () => {
+        const textButton = fixture.debugElement.query(By.css('div div button'));
+        expect(textButton.nativeElement.innerHTML).toContain('fa-' + iconString);
+      });
+    });
+  });
+  describe('on click model', () => {
+    initAsync(dummySectionClick, menuService);
+    beforeEach(() => {
+      spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
+      fixture = TestBed.createComponent(DsoEditMenuSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    describe('when the section model in an on click menu', () => {
+      it('should call the activate method when clicking the button', () => {
+        spyOn(component, 'activate');
+
+        const button = fixture.debugElement.query(By.css('.btn-dark'));
+        button.triggerEventHandler('click', null);
+
+        expect(component.activate).toHaveBeenCalled();
+      });
+    });
+    describe('activate', () => {
+      const mockEvent = jasmine.createSpyObj('event', {
+        preventDefault: jasmine.createSpy('preventDefault'),
+        stopPropagation: jasmine.createSpy('stopPropagation'),
+      });
+      it('should call the item model function when not disabled', () => {
+        spyOn(component.section.model as OnClickMenuItemModel, 'function');
+        component.activate(mockEvent);
+
+        expect((component.section.model as OnClickMenuItemModel).function).toHaveBeenCalled();
+      });
+      it('should call not the item model function when disabled', () => {
+        spyOn(component.section.model as OnClickMenuItemModel, 'function');
+        component.itemModel.disabled = true;
+        component.activate(mockEvent);
+
+        expect((component.section.model as OnClickMenuItemModel).function).not.toHaveBeenCalled();
+        component.itemModel.disabled = false;
+      });
+    });
+
+  });
+
+  describe('link model', () => {
+    initAsync(dummySectionLink, menuService);
+    beforeEach(() => {
+      spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
+      fixture = TestBed.createComponent(DsoEditMenuSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    describe('when the section model in a non disabled link', () => {
+      it('should show a link element with the button in it', () => {
+        const link = fixture.debugElement.query(By.css('a'));
+        expect(link.nativeElement.innerHTML).toContain('button');
+      });
+    });
+
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
new file mode 100644
index 0000000000..af3381ef71
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -0,0 +1,51 @@
+import { Component, Inject, Injector, OnInit } from '@angular/core';
+import { rendersSectionForMenu } from 'src/app/shared/menu/menu-section.decorator';
+import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
+import { MenuService } from '../../../menu/menu.service';
+import { isNotEmpty } from '../../../empty.util';
+import { MenuID } from '../../../menu/menu-id.model';
+import { MenuSection } from '../../../menu/menu-section.model';
+
+/**
+ * Represents a non-expandable section in the dso edit menus
+ */
+@Component({
+  /* tslint:disable:component-selector */
+  selector: 'ds-dso-edit-menu-section',
+  templateUrl: './dso-edit-menu-section.component.html',
+  styleUrls: ['./dso-edit-menu-section.component.scss']
+})
+@rendersSectionForMenu(MenuID.DSO_EDIT, false)
+export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit {
+
+  menuID: MenuID = MenuID.DSO_EDIT;
+  itemModel;
+  hasLink: boolean;
+  canActivate: boolean;
+
+  constructor(
+    @Inject('sectionDataProvider') menuSection: MenuSection,
+    protected menuService: MenuService,
+    protected injector: Injector,
+  ) {
+    super(menuSection, menuService, injector);
+    this.itemModel = menuSection.model;
+  }
+
+  ngOnInit(): void {
+    this.hasLink = isNotEmpty(this.itemModel?.link);
+    this.canActivate = isNotEmpty(this.itemModel?.function);
+    super.ngOnInit();
+  }
+
+  /**
+   * Activate the section's model funtion
+   */
+  public activate(event: any) {
+    event.preventDefault();
+    if (!this.itemModel.disabled) {
+      this.itemModel.function();
+    }
+    event.stopPropagation();
+  }
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
new file mode 100644
index 0000000000..000da1678e
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
@@ -0,0 +1,6 @@
+<div class="dso-edit-menu d-flex">
+    <div *ngFor="let section of (sections | async)" class="ml-1">
+        <ng-container
+                *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+    </div>
+</div>
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.scss
similarity index 100%
rename from src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html
rename to src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.scss
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts
new file mode 100644
index 0000000000..5616e8ea10
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts
@@ -0,0 +1,76 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { Injector, NO_ERRORS_SCHEMA } from '@angular/core';
+import { of as observableOf } from 'rxjs';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ActivatedRoute } from '@angular/router';
+import { DsoEditMenuComponent } from './dso-edit-menu.component';
+import { MenuServiceStub } from '../../testing/menu-service.stub';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { AuthService } from '../../../core/auth/auth.service';
+import { AuthServiceStub } from '../../testing/auth-service.stub';
+import { MenuService } from '../../menu/menu.service';
+import { MenuItemModel } from '../../menu/menu-item/models/menu-item.model';
+import { ThemeService } from '../../theme-support/theme.service';
+import { getMockThemeService } from '../../mocks/theme-service.mock';
+
+
+import { DsoPageModule } from '../dso-page.module';
+
+describe('DsoEditMenuComponent', () => {
+  let comp: DsoEditMenuComponent;
+  let fixture: ComponentFixture<DsoEditMenuComponent>;
+  const menuService = new MenuServiceStub();
+  let authorizationService: AuthorizationDataService;
+
+  const routeStub = {
+    children: []
+  };
+
+  const section = {
+    id: 'edit-dso',
+    active: false,
+    visible: true,
+    model: {
+      type: null,
+      disabled: false,
+    } as MenuItemModel,
+    icon: 'pencil-alt',
+    index: 1
+  };
+
+
+  beforeEach(waitForAsync(() => {
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
+    spyOn(menuService, 'getMenuTopSections').and.returnValue(observableOf([section]));
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), RouterTestingModule, DsoPageModule],
+      declarations: [DsoEditMenuComponent],
+      providers: [
+        Injector,
+        {provide: MenuService, useValue: menuService},
+        {provide: AuthService, useClass: AuthServiceStub},
+        {provide: ActivatedRoute, useValue: routeStub},
+        {provide: AuthorizationDataService, useValue: authorizationService},
+        {provide: ThemeService, useValue: getMockThemeService()},
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMenuComponent);
+    comp = fixture.componentInstance;
+    comp.sections = observableOf([]);
+    fixture.detectChanges();
+  });
+
+  describe('onInit', () => {
+    it('should create', () => {
+      expect(comp).toBeTruthy();
+    });
+  });
+});
+
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
new file mode 100644
index 0000000000..ff4f957314
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
@@ -0,0 +1,34 @@
+import { Component, Injector } from '@angular/core';
+import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
+import { MenuComponent } from '../../menu/menu.component';
+import { MenuService } from '../../menu/menu.service';
+import { ActivatedRoute } from '@angular/router';
+import { ThemeService } from '../../theme-support/theme.service';
+import { MenuID } from '../../menu/menu-id.model';
+
+/**
+ * Component representing the edit menu and other menus on the dspace object pages
+ */
+@Component({
+  selector: 'ds-dso-edit-menu',
+  styleUrls: ['./dso-edit-menu.component.scss'],
+  templateUrl: './dso-edit-menu.component.html',
+})
+export class DsoEditMenuComponent extends MenuComponent {
+  /**
+   * The menu ID of this component is DSO_EDIT
+   * @type {MenuID.DSO_EDIT}
+   */
+  menuID = MenuID.DSO_EDIT;
+
+
+  constructor(protected menuService: MenuService,
+              protected injector: Injector,
+              public authorizationService: AuthorizationDataService,
+              public route: ActivatedRoute,
+              protected themeService: ThemeService
+  ) {
+    super(menuService, injector, authorizationService, route, themeService);
+  }
+
+}
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html
deleted file mode 100644
index d680c140d8..0000000000
--- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<a *ngIf="isAuthorized$ | async"
-   [routerLink]="[pageRoute, 'edit', 'metadata']"
-   class="edit-button btn btn-dark btn-sm"
-   [ngbTooltip]="tooltipMsg | translate"
-   role="button" [title]="tooltipMsg |translate" [attr.aria-label]="tooltipMsg |translate">
-  <i class="fas fa-pencil-alt fa-fw"></i>
-</a>
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
deleted file mode 100644
index 8b13789179..0000000000
--- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts
deleted file mode 100644
index 5949a98f71..0000000000
--- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DsoPageEditButtonComponent } from './dso-page-edit-button.component';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Item } from '../../../core/shared/item.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { By } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-describe('DsoPageEditButtonComponent', () => {
-  let component: DsoPageEditButtonComponent;
-  let fixture: ComponentFixture<DsoPageEditButtonComponent>;
-
-  let authorizationService: AuthorizationDataService;
-  let dso: DSpaceObject;
-
-  beforeEach(waitForAsync(() => {
-    dso = Object.assign(new Item(), {
-      id: 'test-item',
-      _links: {
-        self: { href: 'test-item-selflink' }
-      }
-    });
-    authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
-    });
-    TestBed.configureTestingModule({
-      declarations: [DsoPageEditButtonComponent],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationService }
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DsoPageEditButtonComponent);
-    component = fixture.componentInstance;
-    component.dso = dso;
-    component.pageRoute = 'test';
-    fixture.detectChanges();
-  });
-
-  it('should check the authorization of the current user', () => {
-    expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanEditMetadata, dso.self);
-  });
-
-  describe('when the user is authorized', () => {
-    beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).not.toBeNull();
-    });
-  });
-
-  describe('when the user is not authorized', () => {
-    beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should not render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).toBeNull();
-    });
-  });
-});
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts
deleted file mode 100644
index 1879581d23..0000000000
--- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { Observable } from 'rxjs';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-
-@Component({
-  selector: 'ds-dso-page-edit-button',
-  templateUrl: './dso-page-edit-button.component.html',
-  styleUrls: ['./dso-page-edit-button.component.scss']
-})
-/**
- * Display a button linking to the edit page of a DSpaceObject
- */
-export class DsoPageEditButtonComponent implements OnInit {
-  /**
-   * The DSpaceObject to display a button to the edit page for
-   */
-  @Input() dso: DSpaceObject;
-
-  /**
-   * The prefix of the route to the edit page (before the object's UUID, e.g. "items")
-   */
-  @Input() pageRoute: string;
-
-  /**
-   * A message for the tooltip on the button
-   * Supports i18n keys
-   */
-  @Input() tooltipMsg: string;
-
-  /**
-   * Whether or not the current user is authorized to edit the DSpaceObject
-   */
-  isAuthorized$: Observable<boolean>;
-
-  constructor(protected authorizationService: AuthorizationDataService) { }
-
-  ngOnInit() {
-    this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.dso.self);
-  }
-
-}
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html
deleted file mode 100644
index 305900ae33..0000000000
--- a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<a *ngIf="isAuthorized | async"
-   [ngbTooltip]="'item.page.orcid.tooltip' | translate"
-   [routerLink]="[pageRoute, 'orcid']"
-   class="btn btn-dark btn-sm"
-   role="button" ><i class="fab fa-orcid fa-lg"></i>
-</a>
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.scss b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts
deleted file mode 100644
index c70ec4b808..0000000000
--- a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Item } from '../../../core/shared/item.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { By } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DsoPageOrcidButtonComponent } from './dso-page-orcid-button.component';
-
-describe('DsoPageOrcidButtonComponent', () => {
-  let component: DsoPageOrcidButtonComponent;
-  let fixture: ComponentFixture<DsoPageOrcidButtonComponent>;
-
-  let authorizationService: AuthorizationDataService;
-  let dso: DSpaceObject;
-
-  beforeEach(waitForAsync(() => {
-    dso = Object.assign(new Item(), {
-      id: 'test-item',
-      _links: {
-        self: { href: 'test-item-selflink' }
-      }
-    });
-    authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
-    });
-    TestBed.configureTestingModule({
-      declarations: [DsoPageOrcidButtonComponent],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationService }
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DsoPageOrcidButtonComponent);
-    component = fixture.componentInstance;
-    component.dso = dso;
-    component.pageRoute = 'test';
-    fixture.detectChanges();
-  });
-
-  it('should check the authorization of the current user', () => {
-    expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanSynchronizeWithORCID, dso.self);
-  });
-
-  describe('when the user is authorized', () => {
-    beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).not.toBeNull();
-    });
-  });
-
-  describe('when the user is not authorized', () => {
-    beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should not render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).toBeNull();
-    });
-  });
-});
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts
deleted file mode 100644
index c345d8cbdc..0000000000
--- a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-
-import { BehaviorSubject } from 'rxjs';
-import { take } from 'rxjs/operators';
-
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-
-@Component({
-  selector: 'ds-dso-page-orcid-button',
-  templateUrl: './dso-page-orcid-button.component.html',
-  styleUrls: ['./dso-page-orcid-button.component.scss']
-})
-export class DsoPageOrcidButtonComponent implements OnInit {
- /**
-  * The DSpaceObject to display a button to the edit page for
-  */
- @Input() dso: DSpaceObject;
-
- /**
-  * The prefix of the route to the edit page (before the object's UUID, e.g. "items")
-  */
- @Input() pageRoute: string;
-
- /**
-  * Whether or not the current user is authorized to edit the DSpaceObject
-  */
- isAuthorized: BehaviorSubject<boolean> = new BehaviorSubject(false);
-
- constructor(protected authorizationService: AuthorizationDataService) { }
-
- ngOnInit() {
-   this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, this.dso.self).pipe(take(1)).subscribe((isAuthorized: boolean) => {
-    this.isAuthorized.next(isAuthorized);
-  });
- }
-
-}
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html
deleted file mode 100644
index 0e2e35dcb7..0000000000
--- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<button *ngIf="isAuthorized$ | async"
-        class="edit-button btn btn-dark btn-sm"
-        (click)="createNewVersion()"
-        [disabled]="disableNewVersionButton$ | async"
-        [ngbTooltip]="tooltipMsg$ | async | translate"
-        role="button" [title]="tooltipMsg$ | async |translate" [attr.aria-label]="tooltipMsg$ | async | translate">
-  <i class="fas fa-code-branch fa-fw"></i>
-</button>
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss
deleted file mode 100644
index e8b7d689a3..0000000000
--- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.btn-dark {
-  background-color: var(--ds-admin-sidebar-bg);
-}
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts
deleted file mode 100644
index 9839507d57..0000000000
--- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DsoPageVersionButtonComponent } from './dso-page-version-button.component';
-import { Item } from '../../../core/shared/item.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { Observable, of, of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { By } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-
-describe('DsoPageVersionButtonComponent', () => {
-  let component: DsoPageVersionButtonComponent;
-  let fixture: ComponentFixture<DsoPageVersionButtonComponent>;
-
-  let authorizationService: AuthorizationDataService;
-  let versionHistoryService: VersionHistoryDataService;
-
-  let dso: Item;
-  let tooltipMsg: Observable<string>;
-
-  const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
-
-  const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService',
-    ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', 'hasDraftVersion$']
-  );
-
-  beforeEach(waitForAsync(() => {
-    dso = Object.assign(new Item(), {
-      id: 'test-item',
-      _links: {
-        self: { href: 'test-item-selflink' },
-        version: { href: 'test-item-version-selflink' },
-      },
-    });
-    tooltipMsg = of('tooltip-msg');
-
-    TestBed.configureTestingModule({
-      declarations: [DsoPageVersionButtonComponent],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationServiceSpy },
-        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
-      ]
-    }).compileComponents();
-
-    authorizationService = TestBed.inject(AuthorizationDataService);
-    versionHistoryService = TestBed.inject(VersionHistoryDataService);
-
-    versionHistoryServiceSpy.hasDraftVersion$.and.returnValue(observableOf(true));
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DsoPageVersionButtonComponent);
-    component = fixture.componentInstance;
-    component.dso = dso;
-    component.tooltipMsg$ = tooltipMsg;
-    fixture.detectChanges();
-  });
-
-  it('should check the authorization of the current user', () => {
-    expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanCreateVersion, dso.self);
-  });
-
-  it('should check if the item has a draft version', () => {
-    expect(versionHistoryServiceSpy.hasDraftVersion$).toHaveBeenCalledWith(dso._links.version.href);
-  });
-
-  describe('when the user is authorized', () => {
-    beforeEach(() => {
-      authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(true));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should render a button', () => {
-      const button = fixture.debugElement.query(By.css('button'));
-      expect(button).not.toBeNull();
-    });
-  });
-
-  describe('when the user is not authorized', () => {
-    beforeEach(() => {
-      authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(false));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should render a button', () => {
-      const button = fixture.debugElement.query(By.css('button'));
-      expect(button).toBeNull();
-    });
-  });
-
-});
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts
deleted file mode 100644
index cf07953c75..0000000000
--- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { Observable, of } from 'rxjs';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { Item } from '../../../core/shared/item.model';
-import { map, startWith, switchMap } from 'rxjs/operators';
-
-@Component({
-  selector: 'ds-dso-page-version-button',
-  templateUrl: './dso-page-version-button.component.html',
-  styleUrls: ['./dso-page-version-button.component.scss']
-})
-/**
- * Display a button linking to the edit page of a DSpaceObject
- */
-export class DsoPageVersionButtonComponent implements OnInit {
-  /**
-   * The item for which display a button to create a new version
-   */
-  @Input() dso: Item;
-
-  /**
-   * A message for the tooltip on the button
-   * Supports i18n keys
-   */
-  @Input() tooltipMsgCreate: string;
-
-  /**
-   * A message for the tooltip on the button (when is disabled)
-   * Supports i18n keys
-   */
-  @Input() tooltipMsgHasDraft: string;
-
-  /**
-   * Emits an event that triggers the creation of the new version
-   */
-  @Output() newVersionEvent = new EventEmitter();
-
-  /**
-   * Whether or not the current user is authorized to create a new version of the DSpaceObject
-   */
-  isAuthorized$: Observable<boolean>;
-
-  disableNewVersionButton$: Observable<boolean>;
-
-  tooltipMsg$: Observable<string>;
-
-  constructor(
-    protected authorizationService: AuthorizationDataService,
-    protected versionHistoryService: VersionHistoryDataService,
-  ) {
-  }
-
-  /**
-   * Creates a new version for the current item
-   */
-  createNewVersion() {
-    this.newVersionEvent.emit();
-  }
-
-  ngOnInit() {
-    this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, this.dso.self);
-
-    this.disableNewVersionButton$ = this.versionHistoryService.hasDraftVersion$(this.dso._links.version.href).pipe(
-      // button is disabled if hasDraftVersion = true, and enabled if hasDraftVersion = false or null
-      // (hasDraftVersion is null when a version history does not exist)
-      map((res) => Boolean(res)),
-      startWith(true),
-    );
-
-    this.tooltipMsg$ = this.disableNewVersionButton$.pipe(
-      switchMap((hasDraftVersion) => of(hasDraftVersion ? this.tooltipMsgHasDraft : this.tooltipMsgCreate)),
-    );
-  }
-
-}
diff --git a/src/app/shared/dso-page/dso-page.module.ts b/src/app/shared/dso-page/dso-page.module.ts
new file mode 100644
index 0000000000..6820e8eb53
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page.module.ts
@@ -0,0 +1,55 @@
+import { NgModule } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterModule } from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { DsoEditMenuComponent } from '../dso-page/dso-edit-menu/dso-edit-menu.component';
+import {
+  DsoEditMenuSectionComponent
+} from '../dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component';
+import {
+  DsoEditMenuExpandableSectionComponent
+} from '../dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+
+const COMPONENTS = [
+  DsoEditMenuComponent,
+  DsoEditMenuSectionComponent,
+  DsoEditMenuExpandableSectionComponent,
+];
+
+const ENTRY_COMPONENTS = [
+];
+
+const MODULES = [
+  TranslateModule,
+  RouterModule,
+  CommonModule,
+  NgbTooltipModule,
+];
+const PROVIDERS = [
+
+];
+
+@NgModule({
+  imports: [
+    ...MODULES
+  ],
+  declarations: [
+    ...COMPONENTS,
+    ...ENTRY_COMPONENTS,
+  ],
+  providers: [
+    ...PROVIDERS,
+    ...ENTRY_COMPONENTS,
+  ],
+  exports: [
+    ...COMPONENTS
+  ]
+})
+
+/**
+ * This module handles all components, providers and modules that are needed for the menu
+ */
+export class DsoPageModule {
+
+}
diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts
new file mode 100644
index 0000000000..fc5c1dafc9
--- /dev/null
+++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts
@@ -0,0 +1,92 @@
+import { DsoVersioningModalService } from './dso-versioning-modal.service';
+import { waitForAsync } from '@angular/core/testing';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { Version } from '../../../core/shared/version.model';
+import { Item } from '../../../core/shared/item.model';
+import { MetadataMap } from '../../../core/shared/metadata.models';
+import { createRelationshipsObservable } from '../../../item-page/simple/item-types/shared/item.component.spec';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { EMPTY, of as observableOf } from 'rxjs';
+
+describe('DsoVersioningModalService', () => {
+  let service: DsoVersioningModalService;
+  let modalService;
+  let versionService;
+  let versionHistoryService;
+  let itemVersionShared;
+  let router;
+  let workspaceItemDataService;
+  let itemService;
+
+  const mockItem: Item = Object.assign(new Item(), {
+    bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+    metadata: new MetadataMap(),
+    relationships: createRelationshipsObservable(),
+    _links: {
+      self: {
+        href: 'item-href'
+      },
+      version: {
+        href: 'version-href'
+      }
+    }
+  });
+
+  beforeEach(waitForAsync(() => {
+    modalService = jasmine.createSpyObj('modalService', {
+      open: {componentInstance: {firstVersion: {}, versionNumber: {}, createVersionEvent: EMPTY}}
+    });
+    versionService = jasmine.createSpyObj('versionService', {
+      findByHref: createSuccessfulRemoteDataObject$<Version>(new Version()),
+    });
+    versionHistoryService = jasmine.createSpyObj('versionHistoryService', {
+      createVersion: createSuccessfulRemoteDataObject$<Version>(new Version()),
+      hasDraftVersion$: observableOf(false)
+    });
+    itemVersionShared = jasmine.createSpyObj('itemVersionShared', ['notifyCreateNewVersion']);
+    router = jasmine.createSpyObj('router', ['navigateByUrl']);
+    workspaceItemDataService = jasmine.createSpyObj('workspaceItemDataService', ['findByItem']);
+    itemService = jasmine.createSpyObj('itemService', ['findByHref']);
+
+    service = new DsoVersioningModalService(
+      modalService,
+      versionService,
+      versionHistoryService,
+      itemVersionShared,
+      router,
+      workspaceItemDataService,
+      itemService
+    );
+  }));
+  describe('when onCreateNewVersion() is called', () => {
+    it('should call versionService.findByHref', () => {
+      service.openCreateVersionModal(mockItem);
+      expect(versionService.findByHref).toHaveBeenCalledWith('version-href');
+    });
+  });
+
+  describe('isNewVersionButtonDisabled', () => {
+    it('should call versionHistoryService.hasDraftVersion$', () => {
+      service.isNewVersionButtonDisabled(mockItem);
+      expect(versionHistoryService.hasDraftVersion$).toHaveBeenCalledWith(mockItem._links.version.href);
+    });
+  });
+
+  describe('getVersioningTooltipMessage', () => {
+    it('should return the create message when isNewVersionButtonDisabled returns false', (done) => {
+      spyOn(service, 'isNewVersionButtonDisabled').and.returnValue(observableOf(false));
+      service.getVersioningTooltipMessage(mockItem, 'draft-message', 'create-message').subscribe((message) => {
+        expect(message).toEqual('create-message');
+        done();
+      });
+    });
+    it('should return the draft message when isNewVersionButtonDisabled returns true', (done) => {
+      spyOn(service, 'isNewVersionButtonDisabled').and.returnValue(observableOf(true));
+      service.getVersioningTooltipMessage(mockItem, 'draft-message', 'create-message').subscribe((message) => {
+        expect(message).toEqual('draft-message');
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
new file mode 100644
index 0000000000..46792294dd
--- /dev/null
+++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
@@ -0,0 +1,101 @@
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Version } from '../../../core/shared/version.model';
+import { map, startWith, switchMap, tap } from 'rxjs/operators';
+import { Item } from '../../../core/shared/item.model';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { VersionDataService } from '../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
+import { Router } from '@angular/router';
+import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Injectable } from '@angular/core';
+import { Observable, of } from 'rxjs';
+import { ItemVersionsSharedService } from '../../../item-page/versions/item-versions-shared.service';
+import {
+  ItemVersionsSummaryModalComponent
+} from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
+
+/**
+ * Service to take care of all the functionality related to the version creation modal
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class DsoVersioningModalService {
+
+
+  constructor(
+    protected modalService: NgbModal,
+    protected versionService: VersionDataService,
+    protected versionHistoryService: VersionHistoryDataService,
+    protected itemVersionShared: ItemVersionsSharedService,
+    protected router: Router,
+    protected workspaceItemDataService: WorkspaceitemDataService,
+    protected itemService: ItemDataService,
+  ) {
+  }
+
+  /**
+   * Open the create version modal for the provided dso
+   */
+  openCreateVersionModal(dso): void {
+
+    const item = dso;
+    const versionHref = item._links.version.href;
+
+    // Open modal
+    const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent);
+
+    // Show current version in modal
+    this.versionService.findByHref(versionHref).pipe(getFirstCompletedRemoteData()).subscribe((res: RemoteData<Version>) => {
+      // if res.hasNoContent then the item is unversioned
+      activeModal.componentInstance.firstVersion = res.hasNoContent;
+      activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version);
+    });
+
+    // On createVersionEvent emitted create new version and notify
+    activeModal.componentInstance.createVersionEvent.pipe(
+      switchMap((summary: string) => this.versionHistoryService.createVersion(item._links.self.href, summary)),
+      getFirstCompletedRemoteData(),
+      // close model (should be displaying loading/waiting indicator) when version creation failed/succeeded
+      tap(() => activeModal.close()),
+      // show success/failure notification
+      tap((res: RemoteData<Version>) => {
+        this.itemVersionShared.notifyCreateNewVersion(res);
+      }),
+      // get workspace item
+      getFirstSucceededRemoteDataPayload<Version>(),
+      switchMap((newVersion: Version) => this.itemService.findByHref(newVersion._links.item.href)),
+      getFirstSucceededRemoteDataPayload<Item>(),
+      switchMap((newVersionItem: Item) => this.workspaceItemDataService.findByItem(newVersionItem.uuid, true, false)),
+      getFirstSucceededRemoteDataPayload<WorkspaceItem>(),
+    ).subscribe((wsItem) => {
+      const wsiId = wsItem.id;
+      const route = 'workspaceitems/' + wsiId + '/edit';
+      this.router.navigateByUrl(route);
+    });
+  }
+
+  /**
+   * Checks if the new version button should be disabled for the provided dso
+   */
+  isNewVersionButtonDisabled(dso): Observable<boolean> {
+    return this.versionHistoryService.hasDraftVersion$(dso._links.version.href).pipe(
+      // button is disabled if hasDraftVersion = true, and enabled if hasDraftVersion = false or null
+      // (hasDraftVersion is null when a version history does not exist)
+      map((res) => Boolean(res)),
+      startWith(true),
+    );
+  }
+
+  /**
+   * Checks and returns the tooltip that needs to be used for the create version button tooltip
+   */
+  getVersioningTooltipMessage(dso, tooltipMsgHasDraft, tooltipMsgCreate): Observable<string> {
+    return this.isNewVersionButtonDisabled(dso).pipe(
+      switchMap((hasDraftVersion) => of(hasDraftVersion ? tooltipMsgHasDraft : tooltipMsgCreate)),
+    );
+  }
+}
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html
deleted file mode 100644
index c4bba286bf..0000000000
--- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<button *ngIf="(isClaimable() | async)"
-        [ngbTooltip]="'item.page.claim.tooltip' | translate"
-        class="edit-button btn btn-dark btn-sm"
-        data-test="item-claim"
-        (click)="claim()">
-  {{'item.page.claim.button' | translate }}
-</button>
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.scss b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts
deleted file mode 100644
index 5d589187b9..0000000000
--- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { PersonPageClaimButtonComponent } from './person-page-claim-button.component';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
-import { RouteService } from '../../../core/services/route.service';
-import { routeServiceStub } from '../../testing/route-service.stub';
-import { Item } from '../../../core/shared/item.model';
-import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-
-describe('PersonPageClaimButtonComponent', () => {
-  let scheduler: TestScheduler;
-  let component: PersonPageClaimButtonComponent;
-  let fixture: ComponentFixture<PersonPageClaimButtonComponent>;
-
-  const mockItem: Item = Object.assign(new Item(), {
-    metadata: {
-      'person.email': [
-        {
-          language: 'en_US',
-          value: 'fake@email.com'
-        }
-      ],
-      'person.birthDate': [
-        {
-          language: 'en_US',
-          value: '1993'
-        }
-      ],
-      'person.jobTitle': [
-        {
-          language: 'en_US',
-          value: 'Developer'
-        }
-      ],
-      'person.familyName': [
-        {
-          language: 'en_US',
-          value: 'Doe'
-        }
-      ],
-      'person.givenName': [
-        {
-          language: 'en_US',
-          value: 'John'
-        }
-      ]
-    },
-    _links: {
-      self: {
-        href: 'item-href'
-      }
-    }
-  });
-
-  const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
-    id: 'test-id',
-    visible: true,
-    type: 'profile',
-    _links: {
-      item: {
-        href: 'https://rest.api/rest/api/profiles/test-id/item'
-      },
-      self: {
-        href: 'https://rest.api/rest/api/profiles/test-id'
-      },
-    }
-  });
-
-  const notificationsService = new NotificationsServiceStub();
-
-  const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-    isAuthorized: jasmine.createSpy('isAuthorized')
-  });
-
-  const researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
-    createFromExternalSource: jasmine.createSpy('createFromExternalSource'),
-    findRelatedItemId: jasmine.createSpy('findRelatedItemId'),
-  });
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
-      ],
-      declarations: [PersonPageClaimButtonComponent],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationDataService },
-        { provide: NotificationsService, useValue: notificationsService },
-        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
-        { provide: RouteService, useValue: routeServiceStub },
-      ]
-    })
-      .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PersonPageClaimButtonComponent);
-    component = fixture.componentInstance;
-    component.object = mockItem;
-  });
-
-  describe('when item can be claimed', () => {
-    beforeEach(() => {
-      authorizationDataService.isAuthorized.and.returnValue(observableOf(true));
-      researcherProfileService.createFromExternalSource.calls.reset();
-      researcherProfileService.findRelatedItemId.calls.reset();
-      fixture.detectChanges();
-    });
-
-    it('should create', () => {
-      expect(component).toBeTruthy();
-    });
-
-    it('should create claim button', () => {
-      const btn = fixture.debugElement.query(By.css('[data-test="item-claim"]'));
-      expect(btn).toBeTruthy();
-    });
-
-    describe('claim', () => {
-      describe('when successfully', () => {
-        beforeEach(() => {
-          scheduler = getTestScheduler();
-          researcherProfileService.createFromExternalSource.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
-          researcherProfileService.findRelatedItemId.and.returnValue(observableOf('test-id'));
-        });
-
-        it('should display success notification', () => {
-          scheduler.schedule(() => component.claim());
-          scheduler.flush();
-
-          expect(researcherProfileService.findRelatedItemId).toHaveBeenCalled();
-          expect(notificationsService.success).toHaveBeenCalled();
-        });
-      });
-
-      describe('when not successfully', () => {
-        beforeEach(() => {
-          scheduler = getTestScheduler();
-          researcherProfileService.createFromExternalSource.and.returnValue(createFailedRemoteDataObject$());
-        });
-
-        it('should display success notification', () => {
-          scheduler.schedule(() => component.claim());
-          scheduler.flush();
-
-          expect(researcherProfileService.findRelatedItemId).not.toHaveBeenCalled();
-          expect(notificationsService.error).toHaveBeenCalled();
-        });
-      });
-    });
-
-  });
-
-  describe('when item cannot be claimed', () => {
-    beforeEach(() => {
-      authorizationDataService.isAuthorized.and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-
-    it('should create', () => {
-      expect(component).toBeTruthy();
-    });
-
-    it('should create claim button', () => {
-      const btn = fixture.debugElement.query(By.css('[data-test="item-claim"]'));
-      expect(btn).toBeFalsy();
-    });
-
-  });
-});
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts
deleted file mode 100644
index f0071d0a41..0000000000
--- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { mergeMap, take } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
-
-import { RouteService } from '../../../core/services/route.service';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
-import { isNotEmpty } from '../../empty.util';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-
-@Component({
-  selector: 'ds-person-page-claim-button',
-  templateUrl: './person-page-claim-button.component.html',
-  styleUrls: ['./person-page-claim-button.component.scss']
-})
-export class PersonPageClaimButtonComponent implements OnInit {
-
-  /**
-   * The target person item to claim
-   */
-  @Input() object: DSpaceObject;
-
-  /**
-   * A boolean representing if item can be claimed or not
-   */
-  claimable$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-
-  constructor(protected routeService: RouteService,
-              protected authorizationService: AuthorizationDataService,
-              protected notificationsService: NotificationsService,
-              protected translate: TranslateService,
-              protected researcherProfileService: ResearcherProfileDataService) {
-  }
-
-  ngOnInit(): void {
-    this.authorizationService.isAuthorized(FeatureID.CanClaimItem, this.object._links.self.href, null, false).pipe(
-      take(1)
-    ).subscribe((isAuthorized: boolean) => {
-      this.claimable$.next(isAuthorized);
-    });
-
-  }
-
-  /**
-   * Create a new researcher profile claiming the current item.
-   */
-  claim() {
-    this.researcherProfileService.createFromExternalSource(this.object._links.self.href).pipe(
-      getFirstCompletedRemoteData(),
-      mergeMap((rd: RemoteData<ResearcherProfile>) => {
-        if (rd.hasSucceeded) {
-          return this.researcherProfileService.findRelatedItemId(rd.payload);
-        } else {
-          return observableOf(null);
-        }
-      }))
-      .subscribe((id: string) => {
-        if (isNotEmpty(id)) {
-          this.notificationsService.success(this.translate.get('researcherprofile.success.claim.title'),
-            this.translate.get('researcherprofile.success.claim.body'));
-          this.claimable$.next(false);
-        } else {
-          this.notificationsService.error(
-            this.translate.get('researcherprofile.error.claim.title'),
-            this.translate.get('researcherprofile.error.claim.body'));
-        }
-      });
-  }
-
-  /**
-   * Returns true if the item is claimable, false otherwise.
-   */
-  isClaimable(): Observable<boolean> {
-    return this.claimable$;
-  }
-
-}
diff --git a/src/app/shared/menu/initial-menus-state.ts b/src/app/shared/menu/initial-menus-state.ts
index d684afc3e7..4759a5712e 100644
--- a/src/app/shared/menu/initial-menus-state.ts
+++ b/src/app/shared/menu/initial-menus-state.ts
@@ -22,5 +22,14 @@ export const initialMenusState: MenusState = {
       visible: true,
       sections: {},
       sectionToSubsectionIndex: {}
-    }
+    },
+  [MenuID.DSO_EDIT]:
+    {
+      id: MenuID.DSO_EDIT,
+      collapsed: true,
+      previewCollapsed: true,
+      visible: false,
+      sections: {},
+      sectionToSubsectionIndex: {}
+    },
 };
diff --git a/src/app/shared/menu/menu-id.model.ts b/src/app/shared/menu/menu-id.model.ts
index 50ce924a1b..4e7d31f467 100644
--- a/src/app/shared/menu/menu-id.model.ts
+++ b/src/app/shared/menu/menu-id.model.ts
@@ -3,5 +3,6 @@
  */
 export enum MenuID {
   ADMIN = 'admin-sidebar',
-  PUBLIC = 'public'
+  PUBLIC = 'public',
+  DSO_EDIT = 'dso-edit'
 }
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.html b/src/app/shared/menu/menu-item/link-menu-item.component.html
index b3d0059217..91e23ad886 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.html
@@ -1,7 +1,7 @@
 
 <a class="nav-item nav-link"
-   [ngClass]="{ 'disabled': !hasLink }"
-   [attr.aria-disabled]="!hasLink"
+   [ngClass]="{ 'disabled': !hasLink || item.disabled }"
+   [attr.aria-disabled]="!hasLink || item.disabled"
    [title]="item.text | translate"
    [routerLink]="getRouterLink()"
    [queryParams]="item.queryParams"
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.ts b/src/app/shared/menu/menu-item/link-menu-item.component.ts
index 78d5b2fc6f..39f9006987 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.ts
@@ -36,7 +36,7 @@ export class LinkMenuItemComponent implements OnInit {
 
   navigate(event: any) {
     event.preventDefault();
-    if (this.getRouterLink()) {
+    if (!this.item.disabled && this.getRouterLink()) {
       this.router.navigate([this.getRouterLink()]);
     }
     event.stopPropagation();
diff --git a/src/app/shared/menu/menu-item/models/altmetric.model.ts b/src/app/shared/menu/menu-item/models/altmetric.model.ts
index 9dabb43a92..e27004c268 100644
--- a/src/app/shared/menu/menu-item/models/altmetric.model.ts
+++ b/src/app/shared/menu/menu-item/models/altmetric.model.ts
@@ -6,5 +6,6 @@ import { MenuItemType } from '../../menu-item-type.model';
  */
 export class AltmetricMenuItemModel implements MenuItemModel {
   type = MenuItemType.ALTMETRIC;
+  disabled: boolean;
   url: string;
 }
diff --git a/src/app/shared/menu/menu-item/models/external-link.model.ts b/src/app/shared/menu/menu-item/models/external-link.model.ts
index c5168a449e..d835691107 100644
--- a/src/app/shared/menu/menu-item/models/external-link.model.ts
+++ b/src/app/shared/menu/menu-item/models/external-link.model.ts
@@ -6,6 +6,7 @@ import { MenuItemType } from '../../menu-item-type.model';
  */
 export class ExternalLinkMenuItemModel implements MenuItemModel {
   type = MenuItemType.EXTERNAL;
+  disabled: boolean;
   text: string;
   href: string;
 }
diff --git a/src/app/shared/menu/menu-item/models/link.model.ts b/src/app/shared/menu/menu-item/models/link.model.ts
index 3fe8b8ccb0..f26340749c 100644
--- a/src/app/shared/menu/menu-item/models/link.model.ts
+++ b/src/app/shared/menu/menu-item/models/link.model.ts
@@ -7,6 +7,7 @@ import { Params } from '@angular/router';
  */
 export class LinkMenuItemModel implements MenuItemModel {
   type = MenuItemType.LINK;
+  disabled: boolean;
   text: string;
   link: string;
   queryParams?: Params | null;
diff --git a/src/app/shared/menu/menu-item/models/menu-item.model.ts b/src/app/shared/menu/menu-item/models/menu-item.model.ts
index b60b55719e..ddca3d222d 100644
--- a/src/app/shared/menu/menu-item/models/menu-item.model.ts
+++ b/src/app/shared/menu/menu-item/models/menu-item.model.ts
@@ -5,4 +5,5 @@ import { MenuItemType } from '../../menu-item-type.model';
  */
 export interface MenuItemModel {
   type: MenuItemType;
+  disabled: boolean;
 }
diff --git a/src/app/shared/menu/menu-item/models/onclick.model.ts b/src/app/shared/menu/menu-item/models/onclick.model.ts
index 2501163bfc..32139001d0 100644
--- a/src/app/shared/menu/menu-item/models/onclick.model.ts
+++ b/src/app/shared/menu/menu-item/models/onclick.model.ts
@@ -6,6 +6,7 @@ import { MenuItemType } from '../../menu-item-type.model';
  */
 export class OnClickMenuItemModel implements MenuItemModel {
   type = MenuItemType.ONCLICK;
+  disabled: boolean;
   text: string;
   function: () => {};
 }
diff --git a/src/app/shared/menu/menu-item/models/search.model.ts b/src/app/shared/menu/menu-item/models/search.model.ts
index eac281da51..1c2b5a6456 100644
--- a/src/app/shared/menu/menu-item/models/search.model.ts
+++ b/src/app/shared/menu/menu-item/models/search.model.ts
@@ -6,6 +6,7 @@ import { MenuItemType } from '../../menu-item-type.model';
  */
 export class SearchMenuItemModel implements MenuItemModel {
   type = MenuItemType.SEARCH;
+  disabled: boolean;
   placeholder: string;
   action: string;
 }
diff --git a/src/app/shared/menu/menu-item/models/text.model.ts b/src/app/shared/menu/menu-item/models/text.model.ts
index 70dc7c1203..4fe8a41cc9 100644
--- a/src/app/shared/menu/menu-item/models/text.model.ts
+++ b/src/app/shared/menu/menu-item/models/text.model.ts
@@ -6,5 +6,6 @@ import { MenuItemType } from '../../menu-item-type.model';
  */
 export class TextMenuItemModel implements MenuItemModel {
   type = MenuItemType.TEXT;
+  disabled: boolean;
   text: string;
 }
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index fd0192ad5f..5e8aecbd44 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -1,4 +1,5 @@
-<a href="javascript:void(0);"
+<a *ngIf="!item.disabled"
+   href="javascript:void(0);"
    class="nav-item nav-link"
    role="button"
    [title]="item.text | translate"
@@ -6,3 +7,4 @@
    (keyup.space)="activate($event)"
    (keyup.enter)="activate($event)"
 >{{item.text | translate}}</a>
+<span *ngIf="item.disabled"   class="nav-item nav-link disabled">{{item.text | translate}}</span>
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
index 8df65a35c1..68e477b1fb 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
@@ -14,13 +14,16 @@ import { MenuItemType } from '../menu-item-type.model';
 @rendersMenuItemForType(MenuItemType.ONCLICK)
 export class OnClickMenuItemComponent {
   item: OnClickMenuItemModel;
+
   constructor(@Inject('itemModelProvider') item: OnClickMenuItemModel) {
     this.item = item;
   }
 
   public activate(event: any) {
-    event.preventDefault();
-    this.item.function();
-    event.stopPropagation();
+    if (!this.item.disabled) {
+      event.preventDefault();
+      this.item.function();
+      event.stopPropagation();
+    }
   }
 }
diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.html b/src/app/shared/menu/menu-item/text-menu-item.component.html
index 7ba353e5e7..11c4420402 100644
--- a/src/app/shared/menu/menu-item/text-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/text-menu-item.component.html
@@ -1 +1 @@
-<span>{{item.text | translate}}</span>
\ No newline at end of file
+<span [class.disabled]="item.disabled">{{item.text | translate}}</span>
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index bef90b21c3..9b5bd499e1 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -65,7 +65,9 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    */
   toggleSection(event: Event) {
     event.preventDefault();
-    this.menuService.toggleActiveSection(this.menuID, this.section.id);
+    if (!this.section.model?.disabled) {
+      this.menuService.toggleActiveSection(this.menuID, this.section.id);
+    }
   }
 
   /**
@@ -74,7 +76,9 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    */
   activateSection(event: Event) {
     event.preventDefault();
-    this.menuService.activateSection(this.menuID, this.section.id);
+    if (!this.section.model?.disabled) {
+      this.menuService.activateSection(this.menuID, this.section.id);
+    }
   }
 
   /**
diff --git a/src/app/shared/menu/menu.effects.spec.ts b/src/app/shared/menu/menu.effects.spec.ts
deleted file mode 100644
index 72319e06b8..0000000000
--- a/src/app/shared/menu/menu.effects.spec.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { LinkMenuItemModel } from './menu-item/models/link.model';
-import { TestBed } from '@angular/core/testing';
-import { MenuService } from './menu.service';
-import { ActivatedRoute } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
-import { ROUTER_NAVIGATED } from '@ngrx/router-store';
-import { MenuEffects } from './menu.effects';
-import { MenuSection } from './menu-section.model';
-import { MenuID } from './menu-id.model';
-import { MenuItemType } from './menu-item-type.model';
-
-describe('MenuEffects', () => {
-  let menuEffects: MenuEffects;
-  let routeDataMenuSection: MenuSection;
-  let routeDataMenuSectionResolved: MenuSection;
-  let routeDataMenuChildSection: MenuSection;
-  let toBeRemovedMenuSection: MenuSection;
-  let alreadyPresentMenuSection: MenuSection;
-  let route;
-  let menuService;
-  let actions: Observable<any>;
-
-  function init() {
-    routeDataMenuSection = {
-      id: 'mockSection_:idparam',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.mockSection',
-        link: 'path/:linkparam'
-      } as LinkMenuItemModel
-    };
-    routeDataMenuSectionResolved = {
-      id: 'mockSection_id_param_resolved',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.mockSection',
-        link: 'path/link_param_resolved'
-      } as LinkMenuItemModel
-    };
-    routeDataMenuChildSection = {
-      id: 'mockChildSection',
-      parentID: 'mockSection',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.mockChildSection',
-        link: ''
-      } as LinkMenuItemModel
-    };
-    toBeRemovedMenuSection = {
-      id: 'toBeRemovedSection',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.toBeRemovedSection',
-        link: ''
-      } as LinkMenuItemModel
-    };
-    alreadyPresentMenuSection = {
-      id: 'alreadyPresentSection',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.alreadyPresentSection',
-        link: ''
-      } as LinkMenuItemModel
-    };
-    route = {
-      root: {
-        snapshot: {
-          data: {
-            menu: {
-              [MenuID.PUBLIC]: [routeDataMenuSection, alreadyPresentMenuSection]
-            }
-          },
-          params: {
-            idparam: 'id_param_resolved',
-            linkparam: 'link_param_resolved',
-          }
-        },
-        firstChild: {
-          snapshot: {
-            data: {
-              menu: {
-                [MenuID.PUBLIC]: routeDataMenuChildSection
-              }
-            }
-          }
-        }
-      }
-    };
-
-    menuService = jasmine.createSpyObj('menuService', {
-      getNonPersistentMenuSections: observableOf([toBeRemovedMenuSection, alreadyPresentMenuSection]),
-      addSection: {},
-      removeSection: {}
-    });
-  }
-
-  beforeEach(() => {
-    init();
-    TestBed.configureTestingModule({
-      providers: [
-        MenuEffects,
-        { provide: MenuService, useValue: menuService },
-        { provide: ActivatedRoute, useValue: route },
-        provideMockActions(() => actions)
-      ]
-    });
-
-    menuEffects = TestBed.inject(MenuEffects);
-  });
-
-  describe('buildRouteMenuSections$', () => {
-    it('should add and remove menu sections depending on the current route', () => {
-      actions = hot('--a-', {
-        a: {
-          type: ROUTER_NAVIGATED
-        }
-      });
-
-      const expected = cold('--b-', {
-        b: {
-          type: ROUTER_NAVIGATED
-        }
-      });
-
-      expect(menuEffects.buildRouteMenuSections$).toBeObservable(expected);
-      expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuSectionResolved);
-      expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuChildSection);
-      expect(menuService.addSection).not.toHaveBeenCalledWith(MenuID.PUBLIC, alreadyPresentMenuSection);
-      expect(menuService.removeSection).toHaveBeenCalledWith(MenuID.PUBLIC, toBeRemovedMenuSection.id);
-    });
-  });
-});
diff --git a/src/app/shared/menu/menu.effects.ts b/src/app/shared/menu/menu.effects.ts
deleted file mode 100644
index d566545352..0000000000
--- a/src/app/shared/menu/menu.effects.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { ActivatedRoute } from '@angular/router';
-import { hasNoValue, hasValue } from '../empty.util';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { MenuService } from './menu.service';
-import { Observable } from 'rxjs';
-import { Action } from '@ngrx/store';
-import { ROUTER_NAVIGATED } from '@ngrx/router-store';
-import { Injectable } from '@angular/core';
-import { map, take, tap } from 'rxjs/operators';
-import { MenuSection } from './menu-section.model';
-import { MenuID } from './menu-id.model';
-
-/**
- * Effects modifying the state of menus
- */
-@Injectable()
-export class MenuEffects {
-
-  /**
-   * On route change, build menu sections for every menu type depending on the current route data
-   */
-  public buildRouteMenuSections$: Observable<Action> = createEffect(() => this.actions$
-    .pipe(
-      ofType(ROUTER_NAVIGATED),
-      tap(() => {
-        Object.values(MenuID).forEach((menuID) => {
-          this.buildRouteMenuSections(menuID);
-        });
-      })
-    ), { dispatch: false });
-
-  constructor(private actions$: Actions,
-    private menuService: MenuService,
-    private route: ActivatedRoute) {
-  }
-
-  /**
-   * Build menu sections depending on the current route
-   * - Adds sections found in the current route data that aren't active yet
-   * - Removes sections that are active, but not present in the current route data
-   * @param menuID  The menu to add/remove sections to/from
-   */
-  buildRouteMenuSections(menuID: MenuID) {
-    this.menuService.getNonPersistentMenuSections(menuID).pipe(
-      map((sections) => sections.map((section) => section.id)),
-      take(1)
-    ).subscribe((shouldNotPersistIDs: string[]) => {
-      const resolvedSections = this.resolveRouteMenuSections(this.route.root, menuID);
-      resolvedSections.forEach((section) => {
-        const index = shouldNotPersistIDs.indexOf(section.id);
-        if (index > -1) {
-          shouldNotPersistIDs.splice(index, 1);
-        } else {
-          this.menuService.addSection(menuID, section);
-        }
-      });
-      shouldNotPersistIDs.forEach((id) => {
-        this.menuService.removeSection(menuID, id);
-      });
-    });
-  }
-
-  /**
-   * Resolve menu sections defined in the current route data (including parent routes)
-   * @param route   The route to resolve data for
-   * @param menuID  The menu to resolve data for
-   */
-  resolveRouteMenuSections(route: ActivatedRoute, menuID: MenuID): MenuSection[] {
-    const data = route.snapshot.data;
-    const params = route.snapshot.params;
-    const last: boolean = hasNoValue(route.firstChild);
-
-    if (hasValue(data) && hasValue(data.menu) && hasValue(data.menu[menuID])) {
-      let menuSections: MenuSection[] | MenuSection = data.menu[menuID];
-      menuSections = this.resolveSubstitutions(menuSections, params);
-
-      if (!Array.isArray(menuSections)) {
-        menuSections = [menuSections];
-      }
-
-      if (!last) {
-        return [...menuSections, ...this.resolveRouteMenuSections(route.firstChild, menuID)];
-      } else {
-        return [...menuSections];
-      }
-    }
-
-    return !last ? this.resolveRouteMenuSections(route.firstChild, menuID) : [];
-  }
-
-  private resolveSubstitutions(object, params) {
-
-    let resolved;
-    if (typeof object === 'string') {
-      resolved = object;
-      let match: RegExpMatchArray;
-      do {
-        match = resolved.match(/:(\w+)/);
-        if (match) {
-          const substitute = params[match[1]];
-          if (hasValue(substitute)) {
-            resolved = resolved.replace(match[0], `${substitute}`);
-          }
-        }
-      } while (match);
-    } else if (Array.isArray(object)) {
-      resolved = [];
-      object.forEach((entry, index) => {
-        resolved[index] = this.resolveSubstitutions(object[index], params);
-      });
-    } else if (typeof object === 'object') {
-      resolved = {};
-      Object.keys(object).forEach((key) => {
-        resolved[key] = this.resolveSubstitutions(object[key], params);
-      });
-    } else {
-      resolved = object;
-    }
-    return resolved;
-  }
-
-}
diff --git a/src/app/shared/menu/menu.module.ts b/src/app/shared/menu/menu.module.ts
index c007af517d..28bdab9987 100644
--- a/src/app/shared/menu/menu.module.ts
+++ b/src/app/shared/menu/menu.module.ts
@@ -24,7 +24,7 @@ const ENTRY_COMPONENTS = [
 const MODULES = [
   TranslateModule,
   RouterModule,
-  CommonModule
+  CommonModule,
 ];
 const PROVIDERS = [
 
diff --git a/src/app/shared/menu/menu.service.spec.ts b/src/app/shared/menu/menu.service.spec.ts
index 589b5ebf6b..f4b0fe3db8 100644
--- a/src/app/shared/menu/menu.service.spec.ts
+++ b/src/app/shared/menu/menu.service.spec.ts
@@ -24,6 +24,9 @@ import { menusReducer } from './menu.reducer';
 import { storeModuleConfig } from '../../app.reducer';
 import { MenuSection } from './menu-section.model';
 import { MenuID } from './menu-id.model';
+import { MenuItemType } from './menu-item-type.model';
+import { LinkMenuItemModel } from './menu-item/models/link.model';
+import { NavigationEnd } from '@angular/router';
 
 describe('MenuService', () => {
   let service: MenuService;
@@ -35,6 +38,14 @@ describe('MenuService', () => {
   let subSection4;
   let topSections;
   let initialState;
+  let routeDataMenuSection: MenuSection;
+  let routeDataMenuSectionResolved: MenuSection;
+  let routeDataMenuChildSection: MenuSection;
+  let toBeRemovedMenuSection: MenuSection;
+  let alreadyPresentMenuSection: MenuSection;
+  let route;
+  let router;
+
 
   function init() {
 
@@ -85,24 +96,103 @@ describe('MenuService', () => {
       }
     };
 
+    routeDataMenuSection = {
+      id: 'mockSection_:idparam',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockSection',
+        link: 'path/:linkparam'
+      } as LinkMenuItemModel
+    };
+    routeDataMenuSectionResolved = {
+      id: 'mockSection_id_param_resolved',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockSection',
+        link: 'path/link_param_resolved'
+      } as LinkMenuItemModel
+    };
+    routeDataMenuChildSection = {
+      id: 'mockChildSection',
+      parentID: 'mockSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockChildSection',
+        link: ''
+      } as LinkMenuItemModel
+    };
+    toBeRemovedMenuSection = {
+      id: 'toBeRemovedSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.toBeRemovedSection',
+        link: ''
+      } as LinkMenuItemModel
+    };
+    alreadyPresentMenuSection = {
+      id: 'alreadyPresentSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.alreadyPresentSection',
+        link: ''
+      } as LinkMenuItemModel
+    };
+    route = {
+      root: {
+        snapshot: {
+          data: {
+            menu: {
+              [MenuID.PUBLIC]: [routeDataMenuSection, alreadyPresentMenuSection]
+            }
+          },
+          params: {
+            idparam: 'id_param_resolved',
+            linkparam: 'link_param_resolved',
+          }
+        },
+        firstChild: {
+          snapshot: {
+            data: {
+              menu: {
+                [MenuID.PUBLIC]: routeDataMenuChildSection
+              }
+            }
+          }
+        }
+      }
+    };
+
+    router = {
+      events: observableOf(new NavigationEnd(1, 'test-url', 'test-url'))
+    };
   }
 
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot({ menus: menusReducer }, storeModuleConfig)
+        StoreModule.forRoot({menus: menusReducer}, storeModuleConfig)
       ],
       providers: [
-        provideMockStore({ initialState }),
-        { provide: MenuService, useValue: service }
+        provideMockStore({initialState}),
+        {provide: MenuService, useValue: service}
       ]
     }).compileComponents();
   }));
 
   beforeEach(() => {
     store = TestBed.inject(Store);
-    service = new MenuService(store);
+    service = new MenuService(store, route, router);
     spyOn(store, 'dispatch');
   });
 
@@ -449,4 +539,32 @@ describe('MenuService', () => {
       expect(store.dispatch).toHaveBeenCalledWith(new DeactivateMenuSectionAction(MenuID.ADMIN, 'fakeID'));
     });
   });
+
+  describe('buildRouteMenuSections', () => {
+    it('should add and remove menu sections depending on the current route', () => {
+      spyOn(service, 'addSection');
+      spyOn(service, 'removeSection');
+
+      spyOn(service, 'getNonPersistentMenuSections').and.returnValue(observableOf([toBeRemovedMenuSection, alreadyPresentMenuSection]));
+
+      service.buildRouteMenuSections(MenuID.PUBLIC);
+
+      expect(service.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuSectionResolved);
+      expect(service.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuChildSection);
+      expect(service.addSection).not.toHaveBeenCalledWith(MenuID.PUBLIC, alreadyPresentMenuSection);
+      expect(service.removeSection).toHaveBeenCalledWith(MenuID.PUBLIC, toBeRemovedMenuSection.id);
+    });
+  });
+
+  describe('listenForRouteChanges', () => {
+    it('should build the menu sections on NavigationEnd event', () => {
+      spyOn(service, 'buildRouteMenuSections');
+
+      service.listenForRouteChanges();
+
+      expect(service.buildRouteMenuSections).toHaveBeenCalledWith(MenuID.ADMIN);
+      expect(service.buildRouteMenuSections).toHaveBeenCalledWith(MenuID.PUBLIC);
+    });
+  });
+
 });
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index 087145ae82..2253e9ce09 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import { AppState, keySelector } from '../../app.reducer';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -11,9 +11,9 @@ import {
   DeactivateMenuSectionAction,
   ExpandMenuAction,
   ExpandMenuPreviewAction,
-  HideMenuAction,
+  HideMenuAction, HideMenuSectionAction,
   RemoveMenuSectionAction,
-  ShowMenuAction,
+  ShowMenuAction, ShowMenuSectionAction,
   ToggleActiveMenuSectionAction,
   ToggleMenuAction,
 } from './menu.actions';
@@ -22,6 +22,7 @@ import { MenuState } from './menu-state.model';
 import { MenuSections } from './menu-sections.model';
 import { MenuSection } from './menu-section.model';
 import { MenuID } from './menu-id.model';
+import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 
 export function menuKeySelector<T>(key: string, selector): MemoizedSelector<MenuState, T> {
   return createSelector(selector, (state) => {
@@ -54,7 +55,11 @@ const getSubSectionsFromSectionSelector = (id: string): MemoizedSelector<MenuSta
 @Injectable()
 export class MenuService {
 
-  constructor(private store: Store<AppState>) {
+  constructor(
+    protected store: Store<AppState>,
+    protected route: ActivatedRoute,
+    protected router: Router,
+  ) {
   }
 
   /**
@@ -266,6 +271,15 @@ export class MenuService {
     this.store.dispatch(new ShowMenuAction(menuID));
   }
 
+  /**
+   * Show a given menu section
+   * @param {MenuID} menuID The ID of the menu
+   * @param id The ID of the section
+   */
+  showMenuSection(menuID: MenuID, id: string): void {
+    this.store.dispatch(new ShowMenuSectionAction(menuID, id));
+  }
+
   /**
    * Hide a given menu
    * @param {MenuID} menuID The ID of the menu
@@ -274,6 +288,15 @@ export class MenuService {
     this.store.dispatch(new HideMenuAction(menuID));
   }
 
+  /**
+   * Hide a given menu section
+   * @param {MenuID} menuID The ID of the menu
+   * @param id The ID of the section
+   */
+  hideMenuSection(menuID: MenuID, id: string): void {
+    this.store.dispatch(new HideMenuSectionAction(menuID, id));
+  }
+
   /**
    * Activate a given menu section when it's currently inactive or deactivate it when it's currently active
    * @param {MenuID} menuID The ID of the menu
@@ -321,4 +344,100 @@ export class MenuService {
     return this.getMenuSection(menuID, id).pipe(map((section) => section.visible));
   }
 
+  listenForRouteChanges(): void {
+    this.router.events.pipe(
+      filter(event => event instanceof NavigationEnd),
+    ).subscribe(() => {
+      Object.values(MenuID).forEach((menuID) => {
+        this.buildRouteMenuSections(menuID);
+      });
+    });
+  }
+
+  /**
+   * Build menu sections depending on the current route
+   * - Adds sections found in the current route data that aren't active yet
+   * - Removes sections that are active, but not present in the current route data
+   * @param menuID  The menu to add/remove sections to/from
+   */
+  buildRouteMenuSections(menuID: MenuID) {
+    this.getNonPersistentMenuSections(menuID).pipe(
+      map((sections) => sections.map((section) => section.id)),
+      take(1)
+    ).subscribe((shouldNotPersistIDs: string[]) => {
+      const resolvedSections = this.resolveRouteMenuSections(this.route.root, menuID);
+      resolvedSections.forEach((section) => {
+        const index = shouldNotPersistIDs.indexOf(section.id);
+        if (index > -1) {
+          shouldNotPersistIDs.splice(index, 1);
+        } else {
+          this.addSection(menuID, section);
+        }
+      });
+      shouldNotPersistIDs.forEach((id) => {
+        this.removeSection(menuID, id);
+      });
+    });
+  }
+
+  /**
+   * Resolve menu sections defined in the current route data (including parent routes)
+   * @param route   The route to resolve data for
+   * @param menuID  The menu to resolve data for
+   */
+  resolveRouteMenuSections(route: ActivatedRoute, menuID: MenuID): MenuSection[] {
+    const data = route.snapshot.data;
+    const params = route.snapshot.params;
+    const last: boolean = hasNoValue(route.firstChild);
+
+    if (hasValue(data) && hasValue(data.menu) && hasValue(data.menu[menuID])) {
+      let menuSections: MenuSection[] | MenuSection = data.menu[menuID];
+      menuSections = this.resolveSubstitutions(menuSections, params);
+
+      if (!Array.isArray(menuSections)) {
+        menuSections = [menuSections];
+      }
+
+      if (!last) {
+        return [...menuSections, ...this.resolveRouteMenuSections(route.firstChild, menuID)];
+      } else {
+        return [...menuSections];
+      }
+    }
+
+    return !last ? this.resolveRouteMenuSections(route.firstChild, menuID) : [];
+  }
+
+  protected resolveSubstitutions(object, params) {
+
+    let resolved;
+    if (typeof object === 'string') {
+      resolved = object;
+      let match: RegExpMatchArray;
+      do {
+        match = resolved.match(/:(\w+)/);
+        if (match) {
+          const substitute = params[match[1]];
+          if (hasValue(substitute)) {
+            resolved = resolved.replace(match[0], `${substitute}`);
+          }
+        }
+      } while (match);
+    } else if (Array.isArray(object)) {
+      resolved = [];
+      object.forEach((entry, index) => {
+        resolved[index] = this.resolveSubstitutions(object[index], params);
+      });
+    } else if (typeof object === 'object') {
+      resolved = {};
+      Object.keys(object).forEach((key) => {
+        resolved[key] = this.resolveSubstitutions(object[key], params);
+      });
+    } else {
+      resolved = object;
+    }
+    return resolved;
+  }
+
+
 }
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.html b/src/app/shared/object-list/identifier-data/identifier-data.component.html
new file mode 100644
index 0000000000..91470628c4
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.html
@@ -0,0 +1,5 @@
+<ng-container>
+  <div *ngIf="identifiers$ | async as identifiers">
+    <span class="">{{ identifiers[0].value | translate }}</span>
+  </div>
+</ng-container>
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
new file mode 100644
index 0000000000..cb6d1d97e5
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { hasValue } from '../../empty.util';
+import { Item } from 'src/app/core/shared/item.model';
+import { IdentifierData } from './identifier-data.model';
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+
+@Component({
+  selector: 'ds-identifier-data',
+  templateUrl: './identifier-data.component.html'
+})
+/**
+ * Component rendering an identifier, eg. DOI or handle
+ */
+export class IdentifierDataComponent {
+
+  @Input() item: Item;
+  identifiers$: Observable<IdentifierData>;
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {IdentifierDataService} identifierDataService
+   */
+  constructor(private identifierDataService: IdentifierDataService) { }
+
+  ngOnInit(): void {
+    if (this.item == null) {
+      // Do not show the identifier if the feature is inactive or if the item is null.
+      return;
+    }
+    if (this.item.identifiers == null) {
+      // In case the identifier has not been loaded, do it individually.
+      this.item.identifiers = this.identifierDataService.getIdentifierDataFor(this.item);
+    }
+    this.identifiers$ = this.item.identifiers.pipe(
+      map((identifierRD) => {
+        if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
+          return identifierRD.payload;
+        } else {
+          return null;
+        }
+      }),
+    );
+  }
+}
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.model.ts b/src/app/shared/object-list/identifier-data/identifier-data.model.ts
new file mode 100644
index 0000000000..e707f396e4
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier-data.model.ts
@@ -0,0 +1,33 @@
+import { autoserialize, deserialize } from 'cerialize';
+import { typedObject } from 'src/app/core/cache/builders/build-decorators';
+import { CacheableObject } from 'src/app/core/cache/cacheable-object.model';
+import { HALLink } from 'src/app/core/shared/hal-link.model';
+import { ResourceType } from 'src/app/core/shared/resource-type';
+import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators';
+import { IDENTIFIERS } from './identifier-data.resource-type';
+import {Identifier} from './identifier.model';
+
+@typedObject
+export class IdentifierData implements CacheableObject {
+  static type = IDENTIFIERS;
+  /**
+   * The type for this IdentifierData
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The
+   */
+  @autoserialize
+  identifiers: Identifier[];
+
+  /**
+   * The {@link HALLink}s for this IdentifierData
+   */
+   @deserialize
+   _links: {
+     self: HALLink;
+   };
+}
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts b/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts
new file mode 100644
index 0000000000..823a43eff9
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from 'src/app/core/shared/resource-type';
+
+/**
+ * The resource type for Identifiers
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const IDENTIFIERS = new ResourceType('identifiers');
diff --git a/src/app/shared/object-list/identifier-data/identifier.model.ts b/src/app/shared/object-list/identifier-data/identifier.model.ts
new file mode 100644
index 0000000000..f528824b36
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier.model.ts
@@ -0,0 +1,30 @@
+import { autoserialize } from 'cerialize';
+
+/**
+ * Identifier model. Identifiers using this model are returned in lists from the /item/{id}/identifiers endpoint
+ *
+ * @author Kim Shepherd
+ */
+export class Identifier {
+  /**
+   * The value of the identifier, eg. http://hdl.handle.net/123456789/123 or https://doi.org/test/doi/1234
+   */
+  @autoserialize
+  value: string;
+  /**
+   * The type of identiifer, eg. "doi", or "handle", or "other"
+   */
+  @autoserialize
+  identifierType: string;
+  /**
+   * The status of the identifier. Some schemes, like DOI, will have a different status based on whether it is
+   * queued for remote registration, reservation, or update, or has been registered, simply minted locally, etc.
+   */
+  @autoserialize
+  identifierStatus: string;
+  /**
+   * The type of resource, in this case Identifier
+   */
+  @autoserialize
+  type: string;
+}
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
new file mode 100644
index 0000000000..8d3afea273
--- /dev/null
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
@@ -0,0 +1,9 @@
+<div>
+  <a *ngIf="(metadataRepresentation.representationType=='browse_link')"
+     target="_blank" class="dont-break-out"
+     [routerLink]="['/browse/', metadataRepresentation.browseDefinition.id]"
+     [queryParams]="getQueryParams()">
+    {{metadataRepresentation.getValue()}}
+  </a>
+  <b>(new browse link page)</b>
+</div>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
new file mode 100644
index 0000000000..32919d9758
--- /dev/null
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
@@ -0,0 +1,62 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { BrowseLinkMetadataListElementComponent } from './browse-link-metadata-list-element.component';
+import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+
+const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type'), {
+  key: 'dc.contributor.author',
+  value: 'Test Author'
+});
+
+const mockMetadataRepresentationWithUrl = Object.assign(new MetadatumRepresentation('type'), {
+  key: 'dc.subject',
+  value: 'http://purl.org/test/subject'
+});
+
+describe('BrowseLinkMetadataListElementComponent', () => {
+  let comp: BrowseLinkMetadataListElementComponent;
+  let fixture: ComponentFixture<BrowseLinkMetadataListElementComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [],
+      declarations: [BrowseLinkMetadataListElementComponent],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(BrowseLinkMetadataListElementComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(BrowseLinkMetadataListElementComponent);
+    comp = fixture.componentInstance;
+    comp.metadataRepresentation = mockMetadataRepresentation;
+    fixture.detectChanges();
+  }));
+
+  waitForAsync(() => {
+    it('should contain the value as a browse link', () => {
+      expect(fixture.debugElement.nativeElement.textContent).toContain(mockMetadataRepresentation.value);
+    });
+    it('should NOT match isLink', () => {
+      expect(comp.isLink).toBe(false);
+    });
+  });
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(BrowseLinkMetadataListElementComponent);
+    comp = fixture.componentInstance;
+    comp.metadataRepresentation = mockMetadataRepresentationWithUrl;
+    fixture.detectChanges();
+  }));
+
+  waitForAsync(() => {
+    it('should contain the value expected', () => {
+      expect(fixture.debugElement.nativeElement.textContent).toContain(mockMetadataRepresentationWithUrl.value);
+    });
+    it('should match isLink', () => {
+      expect(comp.isLink).toBe(true);
+    });
+  });
+
+});
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
new file mode 100644
index 0000000000..0eb0ce05b0
--- /dev/null
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
@@ -0,0 +1,29 @@
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { Component } from '@angular/core';
+import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
+import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
+//@metadataRepresentationComponent('Publication', MetadataRepresentationType.PlainText)
+// For now, authority controlled fields are rendered the same way as plain text fields
+//@metadataRepresentationComponent('Publication', MetadataRepresentationType.AuthorityControlled)
+@metadataRepresentationComponent('Publication', MetadataRepresentationType.BrowseLink)
+@Component({
+  selector: 'ds-browse-link-metadata-list-element',
+  templateUrl: './browse-link-metadata-list-element.component.html'
+})
+/**
+ * A component for displaying MetadataRepresentation objects in the form of plain text
+ * It will simply use the value retrieved from MetadataRepresentation.getValue() to display as plain text
+ */
+export class BrowseLinkMetadataListElementComponent extends MetadataRepresentationListElementComponent {
+  /**
+   * Get the appropriate query parameters for this browse link, depending on whether the browse definition
+   * expects 'startsWith' (eg browse by date) or 'value' (eg browse by title)
+   */
+  getQueryParams() {
+    let queryParams = {startsWith: this.metadataRepresentation.getValue()};
+    if (this.metadataRepresentation.browseDefinition.metadataBrowse) {
+      return {value: this.metadataRepresentation.getValue()};
+    }
+    return queryParams;
+  }
+}
diff --git a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts
new file mode 100644
index 0000000000..f0cc150b3e
--- /dev/null
+++ b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts
@@ -0,0 +1,59 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { mockData } from '../../testing/browse-definition-data-service.stub';
+import { MetadataRepresentationListElementComponent } from './metadata-representation-list-element.component';
+
+// Mock metadata representation values
+const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type', mockData[1]), {
+  key: 'dc.contributor.author',
+  value: 'Test Author'
+});
+const mockMetadataRepresentationUrl = Object.assign(new MetadatumRepresentation('type', mockData[1]), {
+  key: 'dc.subject',
+  value: 'https://www.google.com'
+});
+
+describe('MetadataRepresentationListElementComponent', () => {
+  let comp: MetadataRepresentationListElementComponent;
+  let fixture: ComponentFixture<MetadataRepresentationListElementComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [],
+      declarations: [MetadataRepresentationListElementComponent],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(MetadataRepresentationListElementComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(MetadataRepresentationListElementComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  describe('when the value is not a URL', () => {
+    beforeEach(() => {
+      comp.metadataRepresentation = mockMetadataRepresentation;
+    });
+    it('isLink correctly detects a non-URL string as false', () => {
+      waitForAsync(() => {
+        expect(comp.isLink()).toBe(false);
+      });
+    });
+  });
+
+  describe('when the value is a URL', () => {
+    beforeEach(() => {
+      comp.metadataRepresentation = mockMetadataRepresentationUrl;
+    });
+    it('isLink correctly detects a URL string as true', () => {
+      waitForAsync(() => {
+        expect(comp.isLink()).toBe(true);
+      });
+    });
+  });
+
+});
diff --git a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
index 2e14485fbb..b69f6b37dc 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
@@ -13,4 +13,14 @@ export class MetadataRepresentationListElementComponent {
    * The metadata representation of this component
    */
   metadataRepresentation: MetadataRepresentation;
+
+  /**
+   * Returns true if this component's value matches a basic regex "Is this an HTTP URL" test
+   */
+  isLink(): boolean {
+    // Match any string that begins with http:// or https://
+    const linkPattern = new RegExp(/^https?\/\/.*/);
+    return linkPattern.test(this.metadataRepresentation.getValue());
+  }
+
 }
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
index 31b670b1a3..7b611a7d1f 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
@@ -1,3 +1,17 @@
 <div>
-  <span class="dont-break-out">{{metadataRepresentation.getValue()}}</span>
+  <!-- Because this template is used by default, we will additionally test for representation type and display accordingly -->
+  <span *ngIf="(metadataRepresentation.representationType=='plain_text') && !isLink()" class="dont-break-out">
+    {{metadataRepresentation.getValue()}}
+  </span>
+  <a *ngIf="(metadataRepresentation.representationType=='plain_text') && isLink()" class="dont-break-out"
+  target="_blank" [href]="metadataRepresentation.getValue()">
+    {{metadataRepresentation.getValue()}}
+  </a>
+  <span *ngIf="(metadataRepresentation.representationType=='authority_controlled')" class="dont-break-out">{{metadataRepresentation.getValue()}}</span>
+  <a *ngIf="(metadataRepresentation.representationType=='browse_link')"
+     class="dont-break-out ds-browse-link"
+     [routerLink]="['/browse/', metadataRepresentation.browseDefinition.id]"
+     [queryParams]="getQueryParams()">
+    {{metadataRepresentation.getValue()}}
+  </a>
 </div>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
index af09d3c204..cfb812a475 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
@@ -2,8 +2,12 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { PlainTextMetadataListElementComponent } from './plain-text-metadata-list-element.component';
 import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { By } from '@angular/platform-browser';
+import { mockData } from '../../../testing/browse-definition-data-service.stub';
 
-const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type'), {
+// Render the mock representation with the default mock author browse definition so it is also rendered as a link
+// without affecting other tests
+const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type', mockData[1]), {
   key: 'dc.contributor.author',
   value: 'Test Author'
 });
@@ -33,4 +37,8 @@ describe('PlainTextMetadataListElementComponent', () => {
     expect(fixture.debugElement.nativeElement.textContent).toContain(mockMetadataRepresentation.value);
   });
 
+  it('should contain the browse link as plain text', () => {
+    expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockMetadataRepresentation.value);
+  });
+
 });
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
index 198c3712d9..2d21a7afe8 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
@@ -15,4 +15,15 @@ import { metadataRepresentationComponent } from '../../../metadata-representatio
  * It will simply use the value retrieved from MetadataRepresentation.getValue() to display as plain text
  */
 export class PlainTextMetadataListElementComponent extends MetadataRepresentationListElementComponent {
+  /**
+   * Get the appropriate query parameters for this browse link, depending on whether the browse definition
+   * expects 'startsWith' (eg browse by date) or 'value' (eg browse by title)
+   */
+  getQueryParams() {
+    let queryParams = {startsWith: this.metadataRepresentation.getValue()};
+    if (this.metadataRepresentation.browseDefinition.metadataBrowse) {
+      return {value: this.metadataRepresentation.getValue()};
+    }
+    return queryParams;
+  }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index 3c15eff127..9a4bffadb8 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -2,13 +2,12 @@
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="addQueryParams" queryParamsHandling="merge">
-  <label class="mb-0">
-    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch"/>
-    <span class="filter-value px-1">
+  <label class="mb-0 d-flex w-100">
+    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
+    <span class="w-100 pl-1 break-facet">
+      <span class="float-right badge badge-secondary badge-pill mt-1 ml-1">{{filterValue.count | dsShortNumber}}</span>
       {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
     </span>
   </label>
-  <span class="float-right filter-value-count ml-auto">
-    <span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
-  </span>
+
 </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
index 1211d2d478..9f214a4bac 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
@@ -7,3 +7,11 @@ a {
         vertical-align: text-top;
     }
 }
+
+.break-facet {
+    word-break: break-word;
+}
+
+.filter-checkbox {
+    height: fit-content;
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index d92f6444ac..53acb1d911 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
@@ -18,6 +18,7 @@ import { SearchFacetOptionComponent } from './search-facet-option.component';
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
+import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
 
 describe('SearchFacetOptionComponent', () => {
   let comp: SearchFacetOptionComponent;
@@ -89,7 +90,7 @@ describe('SearchFacetOptionComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
-      declarations: [SearchFacetOptionComponent],
+      declarations: [SearchFacetOptionComponent, ShortNumberPipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
         { provide: Router, useValue: new RouterStub() },
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
index 798038503f..0e6090b0fa 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
@@ -3,6 +3,6 @@
    [queryParams]="changeQueryParams" queryParamsHandling="merge">
   <span class="filter-value px-1">{{filterValue.label}}</span>
   <span class="float-right filter-value-count ml-auto">
-                        <span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
-                    </span>
+    <span class="badge badge-secondary badge-pill">{{filterValue.count | dsShortNumber}}</span>
+  </span>
 </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
index 7eb0cb8a54..b0acf43c32 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
@@ -15,10 +15,14 @@ import { SearchConfigurationService } from '../../../../../../core/shared/search
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { By } from '@angular/platform-browser';
 import { SearchFacetRangeOptionComponent } from './search-facet-range-option.component';
-import { RANGE_FILTER_MAX_SUFFIX, RANGE_FILTER_MIN_SUFFIX } from '../../search-range-filter/search-range-filter.component';
+import {
+  RANGE_FILTER_MAX_SUFFIX,
+  RANGE_FILTER_MIN_SUFFIX
+} from '../../search-range-filter/search-range-filter.component';
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
+import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
 
 describe('SearchFacetRangeOptionComponent', () => {
   let comp: SearchFacetRangeOptionComponent;
@@ -60,7 +64,7 @@ describe('SearchFacetRangeOptionComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
-      declarations: [SearchFacetRangeOptionComponent],
+      declarations: [SearchFacetRangeOptionComponent, ShortNumberPipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
         { provide: Router, useValue: new RouterStub() },
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index d6cb7a3d79..d5f88c5333 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -2,9 +2,9 @@
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="removeQueryParams" queryParamsHandling="merge">
-  <label class="mb-0">
-    <input type="checkbox" [checked]="true" class="my-1 align-self-stretch"/>
-    <span class="filter-value pl-1 text-capitalize">
+  <label class="mb-0 d-flex w-100">
+    <input type="checkbox" [checked]="true" class="my-1 align-self-stretch filter-checkbox"/>
+    <span class="filter-value pl-1 text-capitalize break-facet">
         {{ 'search.filters.' + filterConfig.name + '.' + selectedValue.value | translate: {default: selectedValue.label} }}
     </span>
   </label>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
index 1211d2d478..9f214a4bac 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
@@ -7,3 +7,11 @@ a {
         vertical-align: text-top;
     }
 }
+
+.break-facet {
+    word-break: break-word;
+}
+
+.filter-checkbox {
+    height: fit-content;
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 624d519ad1..de44798462 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -84,6 +84,8 @@ import { LangSwitchComponent } from './lang-switch/lang-switch.component';
 import {
   PlainTextMetadataListElementComponent
 } from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
+import { BrowseLinkMetadataListElementComponent }
+  from './object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component';
 import {
   ItemMetadataListElementComponent
 } from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
@@ -215,7 +217,6 @@ import {
 import {
   AuthorizedCollectionSelectorComponent
 } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
-import { DsoPageEditButtonComponent } from './dso-page/dso-page-edit-button/dso-page-edit-button.component';
 import { HoverClassDirective } from './hover-class.directive';
 import {
   ValidationSuggestionsComponent
@@ -242,21 +243,21 @@ import { MenuModule } from './menu/menu.module';
 import {
   ListableNotificationObjectComponent
 } from './object-list/listable-notification-object/listable-notification-object.component';
+import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
+import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
+import {
+  LogInExternalProviderComponent
+} from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
+import { ShortNumberPipe } from './utils/short-number.pipe';
+import {
+  SupervisionOrderStatusComponent
+} from './object-list/supervision-order-status/supervision-order-status.component';
 import {
   SupervisionGroupSelectorComponent
 } from './dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component';
 import { EpersonGroupListComponent } from './form/eperson-group-list/eperson-group-list.component';
 import { EpersonSearchBoxComponent } from './form/eperson-group-list/eperson-search-box/eperson-search-box.component';
 import { GroupSearchBoxComponent } from './form/eperson-group-list/group-search-box/group-search-box.component';
-import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
-import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
-import {
-  LogInExternalProviderComponent
-} from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
-import {
-  SupervisionOrderStatusComponent
-} from './object-list/supervision-order-status/supervision-order-status.component';
-
 
 const MODULES = [
   CommonModule,
@@ -295,6 +296,7 @@ const PIPES = [
   ObjNgFor,
   BrowserOnlyPipe,
   MarkdownPipe,
+  ShortNumberPipe
 ];
 
 const COMPONENTS = [
@@ -355,13 +357,13 @@ const COMPONENTS = [
   ItemPageTitleFieldComponent,
   ThemedSearchNavbarComponent,
   ListableNotificationObjectComponent,
-  DsoPageEditButtonComponent,
   MetadataFieldWrapperComponent,
   ContextHelpWrapperComponent,
   EpersonGroupListComponent,
   EpersonSearchBoxComponent,
   GroupSearchBoxComponent,
-  SupervisionGroupSelectorComponent
+  SupervisionGroupSelectorComponent,
+  SupervisionOrderStatusComponent
 ];
 
 const ENTRY_COMPONENTS = [
@@ -397,6 +399,7 @@ const ENTRY_COMPONENTS = [
   EditItemSelectorComponent,
   ThemedEditItemSelectorComponent,
   PlainTextMetadataListElementComponent,
+  BrowseLinkMetadataListElementComponent,
   ItemMetadataListElementComponent,
   MetadataRepresentationListElementComponent,
   ItemMetadataRepresentationListElementComponent,
@@ -458,20 +461,18 @@ const DIRECTIVES = [
     ...COMPONENTS,
     ...ENTRY_COMPONENTS,
     ...DIRECTIVES,
-    SupervisionOrderStatusComponent,
   ],
   providers: [
     ...PROVIDERS
   ],
-    exports: [
-        ...MODULES,
-        ...PIPES,
-        ...COMPONENTS,
-        ...ENTRY_COMPONENTS,
-        ...DIRECTIVES,
-        TranslateModule,
-        SupervisionOrderStatusComponent,
-    ]
+  exports: [
+    ...MODULES,
+    ...PIPES,
+    ...COMPONENTS,
+    ...ENTRY_COMPONENTS,
+    ...DIRECTIVES,
+    TranslateModule,
+  ]
 })
 
 /**
diff --git a/src/app/shared/testing/browse-definition-data-service.stub.ts b/src/app/shared/testing/browse-definition-data-service.stub.ts
new file mode 100644
index 0000000000..ec1fc2f05e
--- /dev/null
+++ b/src/app/shared/testing/browse-definition-data-service.stub.ts
@@ -0,0 +1,63 @@
+import { EMPTY, Observable, of as observableOf } from 'rxjs';
+import { RemoteData } from '../../core/data/remote-data';
+import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { BrowseService } from '../../core/browse/browse.service';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { PageInfo } from '../../core/shared/page-info.model';
+
+// This data is in post-serialized form (metadata -> metadataKeys)
+export const mockData: BrowseDefinition[] = [
+      Object.assign(new BrowseDefinition, {
+      'id' : 'dateissued',
+      'metadataBrowse' : false,
+      'dataType' : 'date',
+      'sortOptions' : EMPTY,
+      'order' : 'ASC',
+      'type' : 'browse',
+      'metadataKeys' : [ 'dc.date.issued' ],
+      '_links' : EMPTY
+     }),
+     Object.assign(new BrowseDefinition, {
+      'id' : 'author',
+      'metadataBrowse' : true,
+      'dataType' : 'text',
+      'sortOptions' : EMPTY,
+      'order' : 'ASC',
+      'type' : 'browse',
+      'metadataKeys' : [ 'dc.contributor.*', 'dc.creator' ],
+      '_links' : EMPTY
+    })
+];
+
+export const BrowseDefinitionDataServiceStub: any = {
+
+  /**
+   * Get all BrowseDefinitions
+   */
+  findAll(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return observableOf(createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), mockData)));
+  },
+
+  /**
+   * Get all BrowseDefinitions with any link configuration
+   */
+  findAllLinked(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return observableOf(createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), mockData)));
+  },
+
+  /**
+   * Get the browse URL by providing a list of metadata keys
+   *
+   * @param metadataKeys  a list of fields eg. ['dc.contributor.author', 'dc.creator']
+   */
+  findByFields(metadataKeys: string[]): Observable<RemoteData<BrowseDefinition>> {
+    let searchKeyArray: string[] = [];
+    metadataKeys.forEach((metadataKey) => {
+      searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(metadataKey));
+    });
+    // Return just the first, as a pretend match
+    return observableOf(createSuccessfulRemoteDataObject(mockData[0]));
+  }
+
+};
diff --git a/src/app/shared/utils/short-number.pipe.spec.ts b/src/app/shared/utils/short-number.pipe.spec.ts
new file mode 100644
index 0000000000..99fb246f54
--- /dev/null
+++ b/src/app/shared/utils/short-number.pipe.spec.ts
@@ -0,0 +1,96 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ShortNumberPipe } from './short-number.pipe';
+
+describe('ShortNumber Pipe', () => {
+
+  let shortNumberPipe: ShortNumberPipe;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        ShortNumberPipe
+      ],
+    }).compileComponents();
+
+    shortNumberPipe = TestBed.inject(ShortNumberPipe);
+  });
+
+  it('should not transform with an invalid number', async () => {
+    await testTransform(
+      'tre',
+      'tre'
+    );
+  });
+
+  it('should not transform with an empty string', async () => {
+    await testTransform(
+      '',
+      ''
+    );
+  });
+
+  it('should not transform with zero', async () => {
+    await testTransform(
+      0,
+      '0'
+    );
+  });
+
+  it('should render 1K', async () => {
+    await testTransform(
+      '1000',
+      '1K'
+    );
+  });
+
+  it('should render 1K', async () => {
+    await testTransform(
+      1000,
+      '1K'
+    );
+  });
+
+  it('should render 19.3K', async () => {
+    await testTransform(
+      19300,
+      '19.3K'
+    );
+  });
+
+  it('should render 1M', async () => {
+    await testTransform(
+      1000000,
+      '1M'
+    );
+  });
+
+  it('should render 1B', async () => {
+    await testTransform(
+      1000000000,
+      '1B'
+    );
+  });
+
+  it('should render 1T', async () => {
+    await testTransform(
+      1000000000000,
+      '1T'
+    );
+  });
+
+  it('should render 1Q', async () => {
+    await testTransform(
+      1000000000000000,
+      '1Q'
+    );
+  });
+
+  async function testTransform(input: any, output: string) {
+    expect(
+      await shortNumberPipe.transform(input)
+    ).toMatch(
+      output
+    );
+  }
+});
diff --git a/src/app/shared/utils/short-number.pipe.ts b/src/app/shared/utils/short-number.pipe.ts
new file mode 100644
index 0000000000..e4d5cf8356
--- /dev/null
+++ b/src/app/shared/utils/short-number.pipe.ts
@@ -0,0 +1,40 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isEmpty } from '../empty.util';
+
+
+@Pipe({
+  name: 'dsShortNumber'
+})
+export class ShortNumberPipe implements PipeTransform {
+
+  transform(number: number, args?: any): any {
+    // will only work value is a valid number
+    if (isNaN(number) || isEmpty(number) || number === 0) {
+      return number;
+    }
+
+    let abs = Math.abs(number);
+    const rounder = Math.pow(10, 1);
+    const isNegative = number < 0; // will also work for Negetive numbers
+    let key = '';
+
+    const powers = [
+      {key: 'Q', value: Math.pow(10, 15)},
+      {key: 'T', value: Math.pow(10, 12)},
+      {key: 'B', value: Math.pow(10, 9)},
+      {key: 'M', value: Math.pow(10, 6)},
+      {key: 'K', value: 1000}
+    ];
+
+    for (let i = 0; i < powers.length; i++) {
+      let reduced = abs / powers[i].value;
+      reduced = Math.round(reduced * rounder) / rounder;
+      if (reduced >= 1) {
+        abs = reduced;
+        key = powers[i].key;
+        break;
+      }
+    }
+    return (isNegative ? '-' : '') + abs + key;
+  }
+}
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html
new file mode 100644
index 0000000000..dd0b5d2930
--- /dev/null
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.html
@@ -0,0 +1,20 @@
+<!--
+Template for the identifiers submission section component
+@author Kim Shepherd
+-->
+<!-- Main identifier data -->
+<ng-container *ngVar="(getIdentifierData() | async) as identifierData">
+  <ng-container *ngIf="identifierData && identifierData.identifiers">
+  <div>
+  <span>{{'submission.sections.identifiers.info' | translate}}</span>
+  <ul>
+    <ng-container *ngFor="let identifier of identifierData.identifiers">
+      <ng-container *ngIf="identifierData.displayTypes.includes(identifier.identifierType) && identifier.value">
+        <li>{{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}}
+          {{identifier.value}}</li>
+      </ng-container>
+    </ng-container>
+  </ul>
+ </div>
+ </ng-container>
+</ng-container>
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
new file mode 100644
index 0000000000..041e2af23a
--- /dev/null
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
@@ -0,0 +1,258 @@
+import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
+import { NgxPaginationModule } from 'ngx-pagination';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { SubmissionService } from '../../submission.service';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { SectionsService } from '../sections.service';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
+import { getMockFormService } from '../../../shared/mocks/form-service.mock';
+import { FormService } from '../../../shared/form/form.service';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsType } from '../sections-type';
+import { mockSubmissionCollectionId, mockSubmissionId } from '../../../shared/mocks/submission.mock';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { SubmissionSectionIdentifiersComponent } from './section-identifiers.component';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { SectionFormOperationsService } from '../form/section-form-operations.service';
+import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
+import { License } from '../../../core/shared/license.model';
+import { Collection } from '../../../core/shared/collection.model';
+import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model';
+import { Item } from '../../../core/shared/item.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+
+function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
+  return jasmine.createSpyObj('FormOperationsService', {
+    getConfigAll: jasmine.createSpy('getConfigAll'),
+    getConfigByHref: jasmine.createSpy('getConfigByHref'),
+    getConfigByName: jasmine.createSpy('getConfigByName'),
+    getConfigBySearch: jasmine.createSpy('getConfigBySearch')
+  });
+}
+
+function getMockCollectionDataService(): CollectionDataService {
+  return jasmine.createSpyObj('CollectionDataService', {
+    findById: jasmine.createSpy('findById'),
+    findByHref: jasmine.createSpy('findByHref')
+  });
+}
+
+const mockItem = Object.assign(new Item(), {
+  id: 'fake-match-id',
+  handle: 'fake/handle',
+  metadata: {
+    'dc.title': [
+      {
+        language: null,
+        value: 'mockmatch'
+      }
+    ]
+  },
+});
+
+// Mock identifier data to use with tests
+const identifierData: WorkspaceitemSectionIdentifiersObject = {
+  identifiers: [{
+    value: 'https://doi.org/10.33515/dspace-61',
+    identifierType: 'doi',
+    identifierStatus: 'TO_BE_REGISTERED',
+    type: 'identifier'
+  },
+  {
+    value: '123456789/418',
+    identifierType: 'handle',
+    identifierStatus: null,
+    type: 'identifier'
+  }
+  ],
+  displayTypes: ['doi', 'handle']
+};
+
+// Mock section object to use with tests
+const sectionObject: SectionDataObject = {
+  config: 'https://dspace.org/api/config/submissionforms/identifiers',
+  mandatory: true,
+  opened: true,
+  data: identifierData,
+  errorsToShow: [],
+  serverValidationErrors: [],
+  header: 'submission.sections.submit.progressbar.identifiers',
+  id: 'identifiers',
+  sectionType: SectionsType.Identifiers,
+  sectionVisibility: null
+};
+
+describe('SubmissionSectionIdentifiersComponent test suite', () => {
+  let comp: SubmissionSectionIdentifiersComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<SubmissionSectionIdentifiersComponent>;
+  let submissionServiceStub: any = new SubmissionServiceStub();
+  const sectionsServiceStub: any = new SectionsServiceStub();
+  let formService: any;
+  let formOperationsService: any;
+  let formBuilderService: any;
+  let collectionDataService: any;
+
+  const submissionId = mockSubmissionId;
+  const collectionId = mockSubmissionCollectionId;
+  const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
+    add: jasmine.createSpy('add'),
+    replace: jasmine.createSpy('replace'),
+    remove: jasmine.createSpy('remove'),
+  });
+
+  const licenseText = 'License text';
+  const mockCollection = Object.assign(new Collection(), {
+    name: 'Community 1-Collection 1',
+    id: collectionId,
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 1'
+      }],
+    license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText }))
+  });
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        BrowserModule,
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        NgxPaginationModule,
+        NoopAnimationsModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SubmissionSectionIdentifiersComponent,
+        TestComponent,
+        ObjNgFor,
+        VarDirective,
+      ],
+      providers: [
+        { provide: CollectionDataService, useValue: getMockCollectionDataService() },
+        { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() },
+        { provide: FormService, useValue: getMockFormService() },
+        { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
+        { provide: SubmissionFormsConfigDataService, useValue: getMockSubmissionFormsConfigService() },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: SectionsService, useClass: SectionsServiceStub },
+        { provide: SubmissionService, useClass: SubmissionServiceStub },
+        { provide: 'collectionIdProvider', useValue: collectionId },
+        { provide: 'sectionDataProvider', useValue: sectionObject },
+        { provide: 'submissionIdProvider', useValue: submissionId },
+        { provide: PaginationService, useValue: paginationService },
+        ChangeDetectorRef,
+        FormBuilderService,
+        SubmissionSectionIdentifiersComponent
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.getSectionData.and.returnValue(observableOf(identifierData));
+      const html = `<ds-submission-section-identifiers></ds-submission-section-identifiers>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create SubmissionSectionIdentifiersComponent', inject([SubmissionSectionIdentifiersComponent], (idComp: SubmissionSectionIdentifiersComponent) => {
+      expect(idComp).toBeDefined();
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionSectionIdentifiersComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      submissionServiceStub = TestBed.inject(SubmissionService);
+      formService = TestBed.inject(FormService);
+      formBuilderService = TestBed.inject(FormBuilderService);
+      formOperationsService = TestBed.inject(SectionFormOperationsService);
+      collectionDataService = TestBed.inject(CollectionDataService);
+      compAsAny.pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionObject.id);
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    // Test initialisation of the submission section
+    it('Should init section properly', () => {
+      collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      compAsAny.submissionService.getSubmissionScope.and.returnValue(SubmissionScopeType.WorkspaceItem);
+      spyOn(comp, 'getSectionStatus').and.returnValue(observableOf(true));
+      spyOn(comp, 'getIdentifierData').and.returnValue(observableOf(identifierData));
+      expect(comp.isLoading).toBeTruthy();
+      comp.onSectionInit();
+      fixture.detectChanges();
+      expect(comp.isLoading).toBeFalsy();
+    });
+
+    // The following tests look for proper logic in the getSectionStatus() implementation
+    // These are very simple as we don't really have a 'false' state unless we're still loading
+    it('Should return TRUE if the isLoading is FALSE', () => {
+      compAsAny.isLoading = false;
+      expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
+        a: true
+      }));
+    });
+    it('Should return FALSE if the identifier data is missing handle', () => {
+      compAsAny.isLoadin = true;
+      expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
+        a: false
+      }));
+    });
+  });
+
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts
new file mode 100644
index 0000000000..2dc70f668e
--- /dev/null
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts
@@ -0,0 +1,121 @@
+import {ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+
+import { Observable, of as observableOf, Subscription } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
+import { SectionsType } from '../sections-type';
+import { SectionModelComponent } from '../models/section.model';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionDataObject } from '../models/section-data.model';
+import { SubmissionService } from '../../submission.service';
+import { AlertType } from '../../../shared/alert/aletr-type';
+import { SectionsService } from '../sections.service';
+import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model';
+
+/**
+ * This simple component displays DOI, handle and other identifiers that are already minted for the item in
+ * a workflow / submission section.
+ * ShowMintIdentifierStep will attempt to reserve an identifier before injecting result data for this component.
+ *
+ * @author Kim Shepherd
+ */
+@Component({
+  selector: 'ds-submission-section-identifiers',
+  templateUrl: './section-identifiers.component.html',
+  changeDetection: ChangeDetectionStrategy.Default
+})
+
+@renderSectionFor(SectionsType.Identifiers)
+export class SubmissionSectionIdentifiersComponent extends SectionModelComponent {
+  /**
+   * The Alert categories.
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
+  /**
+   * Variable to track if the section is loading.
+   * @type {boolean}
+   */
+  public isLoading = true;
+
+  /**
+   * Observable identifierData subject
+   * @type {Observable<WorkspaceitemSectionIdentifiersObject>}
+   */
+  public identifierData$: Observable<WorkspaceitemSectionIdentifiersObject> = new Observable<WorkspaceitemSectionIdentifiersObject>();
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+  public subbedIdentifierData: WorkspaceitemSectionIdentifiersObject;
+
+  /**
+   * Initialize instance variables.
+   *
+   * @param {PaginationService} paginationService
+   * @param {TranslateService} translate
+   * @param {SectionsService} sectionService
+   * @param {SubmissionService} submissionService
+   * @param {string} injectedCollectionId
+   * @param {SectionDataObject} injectedSectionData
+   * @param {string} injectedSubmissionId
+   */
+  constructor(protected translate: TranslateService,
+              protected sectionService: SectionsService,
+              protected submissionService: SubmissionService,
+              @Inject('collectionIdProvider') public injectedCollectionId: string,
+              @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
+              @Inject('submissionIdProvider') public injectedSubmissionId: string) {
+    super(injectedCollectionId, injectedSectionData, injectedSubmissionId);
+  }
+
+  ngOnInit() {
+      super.ngOnInit();
+  }
+
+  /**
+   * Initialize all instance variables and retrieve configuration.
+   */
+  onSectionInit() {
+    this.isLoading = false;
+    this.identifierData$ = this.getIdentifierData();
+  }
+
+  /**
+   * Check if identifier section has read-only visibility
+   */
+  isReadOnly(): boolean {
+    return true;
+  }
+
+  /**
+   * Unsubscribe from all subscriptions, if needed.
+   */
+  onSectionDestroy(): void {
+    return;
+  }
+
+  /**
+   * Get section status. Because this simple component never requires human interaction, this is basically
+   * always going to be the opposite of "is this section still loading". This is not the place for API response
+   * error checking but determining whether the step can 'proceed'.
+   *
+   * @return Observable<boolean>
+   *     the section status
+   */
+  public getSectionStatus(): Observable<boolean> {
+    return observableOf(!this.isLoading);
+  }
+
+  /**
+   * Get identifier data (from the REST service) as a simple object with doi, handle, otherIdentifiers variables
+   * and as an observable so it can update in real-time.
+   */
+  getIdentifierData() {
+    return this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType) as
+      Observable<WorkspaceitemSectionIdentifiersObject>;
+  }
+
+}
diff --git a/src/app/submission/sections/sections-type.ts b/src/app/submission/sections/sections-type.ts
index 6b6f839b7c..6fb7380822 100644
--- a/src/app/submission/sections/sections-type.ts
+++ b/src/app/submission/sections/sections-type.ts
@@ -7,4 +7,5 @@ export enum SectionsType {
   collection = 'collection',
   AccessesCondition = 'accessCondition',
   SherpaPolicies = 'sherpaPolicy',
+  Identifiers = 'identifiers',
 }
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index cab4f19c33..91f782225a 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -65,6 +65,7 @@ import {
   MetadataInformationComponent
 } from './sections/sherpa-policies/metadata-information/metadata-information.component';
 import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
+import {SubmissionSectionIdentifiersComponent} from './sections/identifiers/section-identifiers.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -93,6 +94,7 @@ const DECLARATIONS = [
   SubmissionSectionUploadFileComponent,
   SubmissionSectionUploadFileEditComponent,
   SubmissionSectionUploadFileViewComponent,
+  SubmissionSectionIdentifiersComponent,
   SubmissionImportExternalComponent,
   ThemedSubmissionImportExternalComponent,
   SubmissionImportExternalSearchbarComponent,
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
new file mode 100644
index 0000000000..5f741091f1
--- /dev/null
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -0,0 +1,27 @@
+<div *ngIf="(systemWideAlert$ |async)?.active">
+    <div class="rounded-0 alert alert-warning w100">
+        <div class="container">
+            <span class="font-weight-bold">
+        <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
+            {{'system-wide-alert-banner.countdown.prefix' | translate }}
+        </span>
+            <span *ngIf="(countDownDays|async) > 0">
+            {{'system-wide-alert-banner.countdown.days' | translate: {
+                days: countDownDays|async
+            } }}
+        </span>
+            <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
+            {{'system-wide-alert-banner.countdown.hours' | translate: {
+                hours: countDownHours| async
+            } }}
+        </span>
+            <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
+            {{'system-wide-alert-banner.countdown.minutes' | translate: {
+                minutes: countDownMinutes|async
+            } }}
+        </span>
+            </span>
+            <span>{{(systemWideAlert$ |async)?.message}}</span>
+        </div>
+    </div>
+</div>
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.scss b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.scss
similarity index 100%
rename from src/app/item-page/simple/item-types/versioned-item/versioned-item.component.scss
rename to src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.scss
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts
new file mode 100644
index 0000000000..f767d0f196
--- /dev/null
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts
@@ -0,0 +1,114 @@
+import { ComponentFixture, discardPeriodicTasks, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import { SystemWideAlertBannerComponent } from './system-wide-alert-banner.component';
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import { SystemWideAlert } from '../system-wide-alert.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { utcToZonedTime } from 'date-fns-tz';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { TestScheduler } from 'rxjs/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+
+
+describe('SystemWideAlertBannerComponent', () => {
+  let comp: SystemWideAlertBannerComponent;
+  let fixture: ComponentFixture<SystemWideAlertBannerComponent>;
+  let systemWideAlertDataService: SystemWideAlertDataService;
+
+  let systemWideAlert: SystemWideAlert;
+  let scheduler: TestScheduler;
+
+  beforeEach(waitForAsync(() => {
+    scheduler = getTestScheduler();
+
+    const countDownDate = new Date();
+    countDownDate.setDate(countDownDate.getDate() + 1);
+    countDownDate.setHours(countDownDate.getHours() + 1);
+    countDownDate.setMinutes(countDownDate.getMinutes() + 1);
+
+    systemWideAlert = Object.assign(new SystemWideAlert(), {
+      alertId: 1,
+      message: 'Test alert message',
+      active: true,
+      countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString()
+    });
+
+    systemWideAlertDataService = jasmine.createSpyObj('systemWideAlertDataService', {
+      searchBy: createSuccessfulRemoteDataObject$(createPaginatedList([systemWideAlert])),
+    });
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [SystemWideAlertBannerComponent],
+      providers: [
+        {provide: SystemWideAlertDataService, useValue: systemWideAlertDataService},
+        {provide: NotificationsService, useValue: new NotificationsServiceStub()},
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SystemWideAlertBannerComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('init', () => {
+    it('should init the comp', () => {
+      expect(comp).toBeTruthy();
+    });
+    it('should set the time countdown parts in their respective behaviour subjects', fakeAsync(() => {
+      spyOn(comp.countDownDays, 'next');
+      spyOn(comp.countDownHours, 'next');
+      spyOn(comp.countDownMinutes, 'next');
+      comp.ngOnInit();
+      tick(2000);
+      expect(comp.countDownDays.next).toHaveBeenCalled();
+      expect(comp.countDownHours.next).toHaveBeenCalled();
+      expect(comp.countDownMinutes.next).toHaveBeenCalled();
+      discardPeriodicTasks();
+
+    }));
+  });
+
+  describe('banner', () => {
+    it('should display the alert message and the timer', () => {
+      comp.countDownDays.next(1);
+      comp.countDownHours.next(1);
+      comp.countDownMinutes.next(1);
+      fixture.detectChanges();
+
+      const banner = fixture.debugElement.queryAll(By.css('span'));
+      expect(banner.length).toEqual(6);
+
+      expect(banner[0].nativeElement.innerHTML).toContain('system-wide-alert-banner.countdown.prefix');
+      expect(banner[0].nativeElement.innerHTML).toContain('system-wide-alert-banner.countdown.days');
+      expect(banner[0].nativeElement.innerHTML).toContain('system-wide-alert-banner.countdown.hours');
+      expect(banner[0].nativeElement.innerHTML).toContain('system-wide-alert-banner.countdown.minutes');
+
+      expect(banner[5].nativeElement.innerHTML).toContain(systemWideAlert.message);
+    });
+
+    it('should display the alert message but no timer when no timer is present', () => {
+      comp.countDownDays.next(0);
+      comp.countDownHours.next(0);
+      comp.countDownMinutes.next(0);
+      fixture.detectChanges();
+
+      const banner = fixture.debugElement.queryAll(By.css('span'));
+      expect(banner.length).toEqual(2);
+      expect(banner[1].nativeElement.innerHTML).toContain(systemWideAlert.message);
+    });
+
+    it('should not display an alert when none is present', () => {
+      comp.systemWideAlert$.next(null);
+      fixture.detectChanges();
+
+      const banner = fixture.debugElement.queryAll(By.css('span'));
+      expect(banner.length).toEqual(0);
+    });
+  });
+});
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
new file mode 100644
index 0000000000..27bdb14f1d
--- /dev/null
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
@@ -0,0 +1,125 @@
+import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import {
+  getAllSucceededRemoteDataPayload
+} from '../../core/shared/operators';
+import { filter, map, switchMap } from 'rxjs/operators';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { SystemWideAlert } from '../system-wide-alert.model';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { BehaviorSubject, EMPTY, interval, Subscription } from 'rxjs';
+import { zonedTimeToUtc } from 'date-fns-tz';
+import { isPlatformBrowser } from '@angular/common';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+
+/**
+ * Component responsible for rendering a banner and the countdown for an active system-wide alert
+ */
+@Component({
+  selector: 'ds-system-wide-alert-banner',
+  styleUrls: ['./system-wide-alert-banner.component.scss'],
+  templateUrl: './system-wide-alert-banner.component.html'
+})
+export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
+
+  /**
+   * BehaviorSubject that keeps track of the currently configured system-wide alert
+   */
+  systemWideAlert$ = new BehaviorSubject<SystemWideAlert>(undefined);
+
+  /**
+   * BehaviorSubject that keeps track of the amount of minutes left to count down to
+   */
+  countDownMinutes = new BehaviorSubject<number>(0);
+
+  /**
+   * BehaviorSubject that keeps track of the amount of hours left to count down to
+   */
+  countDownHours = new BehaviorSubject<number>(0);
+
+  /**
+   * BehaviorSubject that keeps track of the amount of days left to count down to
+   */
+  countDownDays = new BehaviorSubject<number>(0);
+
+  /**
+   * List of subscriptions
+   */
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    @Inject(PLATFORM_ID) protected platformId: Object,
+    protected systemWideAlertDataService: SystemWideAlertDataService,
+    protected notificationsService: NotificationsService,
+  ) {
+  }
+
+  ngOnInit() {
+    this.subscriptions.push(this.systemWideAlertDataService.searchBy('active').pipe(
+      getAllSucceededRemoteDataPayload(),
+      map((payload: PaginatedList<SystemWideAlert>) => payload.page),
+      filter((page) => isNotEmpty(page)),
+      map((page) => page[0])
+    ).subscribe((alert: SystemWideAlert) => {
+      this.systemWideAlert$.next(alert);
+    }));
+
+    this.subscriptions.push(this.systemWideAlert$.pipe(
+      switchMap((alert: SystemWideAlert) => {
+        if (hasValue(alert) && hasValue(alert.countdownTo)) {
+          const date = zonedTimeToUtc(alert.countdownTo, 'UTC');
+          const timeDifference = date.getTime() - new Date().getTime();
+          if (timeDifference > 0) {
+            this.allocateTimeUnits(timeDifference);
+            if (isPlatformBrowser(this.platformId)) {
+              return interval(1000);
+            } else {
+              return EMPTY;
+            }
+
+          }
+        }
+        // Reset the countDown times to 0 and return EMPTY to prevent unnecessary countdown calculations
+        this.countDownDays.next(0);
+        this.countDownHours.next(0);
+        this.countDownMinutes.next(0);
+        return EMPTY;
+      })
+    ).subscribe(() => {
+      this.setTimeDifference(this.systemWideAlert$.getValue().countdownTo);
+    }));
+  }
+
+  /**
+   * Helper method to calculate the time difference between the countdown date from the system-wide alert and "now"
+   * @param countdownTo - The date to count down to
+   */
+  private setTimeDifference(countdownTo: string) {
+    const date = zonedTimeToUtc(countdownTo, 'UTC');
+
+    const timeDifference = date.getTime() - new Date().getTime();
+    this.allocateTimeUnits(timeDifference);
+  }
+
+  /**
+   * Helper method to push how many days, hours and minutes are left in the countdown to their respective behaviour subject
+   * @param timeDifference  - The time difference to calculate and push the time units for
+   */
+  private allocateTimeUnits(timeDifference) {
+    const minutes = Math.floor((timeDifference) / (1000 * 60) % 60);
+    const hours = Math.floor((timeDifference) / (1000 * 60 * 60) % 24);
+    const days = Math.floor((timeDifference) / (1000 * 60 * 60 * 24));
+
+    this.countDownMinutes.next(minutes);
+    this.countDownHours.next(hours);
+    this.countDownDays.next(days);
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((sub: Subscription) => {
+      if (hasValue(sub)) {
+        sub.unsubscribe();
+      }
+    });
+  }
+}
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
new file mode 100644
index 0000000000..169081e277
--- /dev/null
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -0,0 +1,114 @@
+<div class="container">
+    <h2 id="header">{{'system-wide-alert.form.header' | translate}}</h2>
+    <div [formGroup]="alertForm" [class]="'ng-invalid'">
+        <div class="form-group">
+            <div class="row mb-2">
+                <div class="col">
+                    <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
+                               [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
+                               [checked]="formActive.value"
+                               (change)="setActive($event)"></ui-switch>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <label for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
+                    <textarea id="formMessage" rows="5"
+                              [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
+                              formControlName="formMessage">
+                </textarea>
+                    <div *ngIf="formMessage.invalid && (formMessage.dirty || formMessage.touched)"
+                         class="invalid-feedback show-feedback">
+                <span *ngIf="formMessage.errors">
+                {{ 'system-wide-alert.form.error.message' | translate }}
+            </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col mb-2 d-flex align-items-end">
+            <ui-switch size="small"
+                       [checked]="counterEnabled$ |async"
+                       (change)="setCounterEnabled($event)"></ui-switch>
+            <span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
+        </div>
+    </div>
+    <div *ngIf="counterEnabled$ |async">
+        <div class="row">
+            <div class="col-sm-12 col-md-6">
+                <div class="input-group">
+                    <input
+                            class="form-control"
+                            placeholder="yyyy-mm-dd"
+                            name="dp"
+                            [(ngModel)]="date"
+                            [minDate]="minDate"
+                            ngbDatepicker
+                            #d="ngbDatepicker"
+                            (ngModelChange)="updatePreviewTime()"
+                    />
+                    <button class="btn btn-outline-secondary fas fa-calendar" (click)="d.toggle()"
+                            type="button"></button>
+                </div>
+            </div>
+            <div class="col-12 d-md-none">
+                <div class="input-group">
+                    <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
+                </div>
+            </div>
+            <div class="d-none d-md-block col-md-6 timepicker-margin">
+                <div class="input-group">
+                    <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-2">
+        <span class="text-muted"> {{'system-wide-alert.form.label.countdownTo.hint' | translate}}</span>
+    </div>
+
+
+    <div *ngIf="formMessage.value">
+        <div class="row">
+            <div class="col">
+                <label>{{ 'system-wide-alert.form.label.preview' | translate }}</label>
+            </div>
+        </div>
+        <div class="rounded-0 alert alert-warning">
+            <span class="font-weight-bold">
+        <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
+            {{'system-wide-alert-banner.countdown.prefix' | translate }}
+        </span>
+            <span *ngIf="previewDays > 0">
+            {{'system-wide-alert-banner.countdown.days' | translate: {
+                days: previewDays
+            } }}
+        </span>
+            <span *ngIf="previewDays > 0 || previewHours > 0 ">
+            {{'system-wide-alert-banner.countdown.hours' | translate: {
+                hours: previewHours
+            } }}
+        </span>
+            <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
+            {{'system-wide-alert-banner.countdown.minutes' | translate: {
+                minutes: previewMinutes
+            } }}
+        </span>
+            </span>
+            <span>{{formMessage.value}}</span>
+        </div>
+    </div>
+
+    <div class="btn-row float-right space-children-mr mt-2">
+        <button (click)="back()"
+                class="btn btn-outline-secondary"><i
+                class="fas fa-arrow-left"></i> {{'system-wide-alert.form.cancel' | translate}}</button>
+        <button class="btn btn-primary" [disabled]="alertForm.invalid"
+                (click)="save()">
+            <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate}}
+        </button>
+    </div>
+
+</div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.scss b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.scss
new file mode 100644
index 0000000000..cdcfd8b0cd
--- /dev/null
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.scss
@@ -0,0 +1,4 @@
+.timepicker-margin {
+    // Negative margin to offset the time picker arrows and ensure the date and time are correctly aligned
+    margin-top: -38px;
+}
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
new file mode 100644
index 0000000000..505990b445
--- /dev/null
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
@@ -0,0 +1,314 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import { SystemWideAlert } from '../system-wide-alert.model';
+import { utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { TranslateModule } from '@ngx-translate/core';
+import { SystemWideAlertFormComponent } from './system-wide-alert-form.component';
+import { RequestService } from '../../core/data/request.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { Router } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { UiSwitchModule } from 'ngx-ui-switch';
+import { SystemWideAlertModule } from '../system-wide-alert.module';
+
+describe('SystemWideAlertFormComponent', () => {
+  let comp: SystemWideAlertFormComponent;
+  let fixture: ComponentFixture<SystemWideAlertFormComponent>;
+  let systemWideAlertDataService: SystemWideAlertDataService;
+
+  let systemWideAlert: SystemWideAlert;
+  let requestService: RequestService;
+  let notificationsService;
+  let router;
+
+
+  beforeEach(waitForAsync(() => {
+
+    const countDownDate = new Date();
+    countDownDate.setDate(countDownDate.getDate() + 1);
+    countDownDate.setHours(countDownDate.getHours() + 1);
+    countDownDate.setMinutes(countDownDate.getMinutes() + 1);
+
+    systemWideAlert = Object.assign(new SystemWideAlert(), {
+      alertId: 1,
+      message: 'Test alert message',
+      active: true,
+      countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString()
+    });
+
+    systemWideAlertDataService = jasmine.createSpyObj('systemWideAlertDataService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList([systemWideAlert])),
+      put: createSuccessfulRemoteDataObject$(systemWideAlert),
+      create: createSuccessfulRemoteDataObject$(systemWideAlert)
+    });
+
+    requestService = jasmine.createSpyObj('requestService', ['setStaleByHrefSubstring']);
+
+    notificationsService = new NotificationsServiceStub();
+    router = new RouterStub();
+
+    TestBed.configureTestingModule({
+      imports: [FormsModule, SystemWideAlertModule, UiSwitchModule, TranslateModule.forRoot()],
+      declarations: [SystemWideAlertFormComponent],
+      providers: [
+        {provide: SystemWideAlertDataService, useValue: systemWideAlertDataService},
+        {provide: NotificationsService, useValue: notificationsService},
+        {provide: Router, useValue: router},
+        {provide: RequestService, useValue: requestService},
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SystemWideAlertFormComponent);
+    comp = fixture.componentInstance;
+
+    spyOn(comp, 'createForm').and.callThrough();
+    spyOn(comp, 'initFormValues').and.callThrough();
+
+    fixture.detectChanges();
+  });
+
+  describe('init', () => {
+    it('should init the comp', () => {
+      expect(comp).toBeTruthy();
+    });
+    it('should create the form and init the values based on an existing alert', () => {
+      expect(comp.createForm).toHaveBeenCalled();
+      expect(comp.initFormValues).toHaveBeenCalledWith(systemWideAlert);
+    });
+  });
+
+  describe('createForm', () => {
+    it('should create the form', () => {
+      const now = new Date();
+
+      comp.createForm();
+      expect(comp.formMessage.value).toEqual('');
+      expect(comp.formActive.value).toEqual(false);
+      expect(comp.time).toEqual({hour: now.getHours(), minute: now.getMinutes()});
+      expect(comp.date).toEqual({year: now.getFullYear(), month: now.getMonth() + 1, day: now.getDate()});
+    });
+  });
+
+  describe('initFormValues', () => {
+    it('should fill in the form based on the provided system-wide alert', () => {
+      comp.initFormValues(systemWideAlert);
+
+      const countDownTo = zonedTimeToUtc(systemWideAlert.countdownTo, 'UTC');
+
+      expect(comp.formMessage.value).toEqual(systemWideAlert.message);
+      expect(comp.formActive.value).toEqual(true);
+      expect(comp.time).toEqual({hour: countDownTo.getHours(), minute: countDownTo.getMinutes()});
+      expect(comp.date).toEqual({
+        year: countDownTo.getFullYear(),
+        month: countDownTo.getMonth() + 1,
+        day: countDownTo.getDate()
+      });
+    });
+  });
+  describe('setCounterEnabled', () => {
+    it('should set the preview time on enable and update the behaviour subject', () => {
+      spyOn(comp, 'updatePreviewTime');
+      comp.setCounterEnabled(true);
+
+      expect(comp.updatePreviewTime).toHaveBeenCalled();
+      expect(comp.counterEnabled$.value).toBeTrue();
+    });
+    it('should reset the preview time on disable and update the behaviour subject', () => {
+      spyOn(comp, 'updatePreviewTime');
+      comp.setCounterEnabled(false);
+
+      expect(comp.updatePreviewTime).not.toHaveBeenCalled();
+      expect(comp.previewDays).toEqual(0);
+      expect(comp.previewHours).toEqual(0);
+      expect(comp.previewMinutes).toEqual(0);
+      expect(comp.counterEnabled$.value).toBeFalse();
+    });
+  });
+
+  describe('updatePreviewTime', () => {
+    it('should calculate the difference between the current date and the date configured in the form', () => {
+      const countDownDate = new Date();
+      countDownDate.setDate(countDownDate.getDate() + 1);
+      countDownDate.setHours(countDownDate.getHours() + 1);
+      countDownDate.setMinutes(countDownDate.getMinutes() + 1);
+
+      comp.time = {hour: countDownDate.getHours(), minute: countDownDate.getMinutes()};
+      comp.date = {year: countDownDate.getFullYear(), month: countDownDate.getMonth() + 1, day: countDownDate.getDate()};
+
+      comp.updatePreviewTime();
+
+      expect(comp.previewDays).toEqual(1);
+      expect(comp.previewHours).toEqual(1);
+      expect(comp.previewDays).toEqual(1);
+    });
+  });
+
+  describe('setActive', () => {
+    it('should set whether the alert is active and save the current alert', () => {
+      spyOn(comp, 'save');
+      spyOn(comp.formActive, 'patchValue');
+      comp.setActive(true);
+
+      expect(comp.formActive.patchValue).toHaveBeenCalledWith(true);
+      expect(comp.save).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('save', () => {
+    it('should update the exising alert with the form values and show a success notification on success and navigate back', () => {
+      spyOn(comp, 'back');
+      comp.currentAlert = systemWideAlert;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = {hour: 4, minute: 26};
+      comp.date = {year: 2023, month: 1, day: 25};
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.alertId = systemWideAlert.alertId;
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save();
+
+      expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).toHaveBeenCalled();
+    });
+    it('should update the exising alert with the form values and show a success notification on success and not navigate back when false is provided to the save method', () => {
+      spyOn(comp, 'back');
+      comp.currentAlert = systemWideAlert;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = {hour: 4, minute: 26};
+      comp.date = {year: 2023, month: 1, day: 25};
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.alertId = systemWideAlert.alertId;
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save(false);
+
+      expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).not.toHaveBeenCalled();
+    });
+    it('should update the exising alert with the form values but add an empty countdown date when disabled and show a success notification on success', () => {
+      spyOn(comp, 'back');
+      comp.currentAlert = systemWideAlert;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = {hour: 4, minute: 26};
+      comp.date = {year: 2023, month: 1, day: 25};
+      comp.counterEnabled$.next(false);
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.alertId = systemWideAlert.alertId;
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      expectedAlert.countdownTo = null;
+
+      comp.save();
+
+      expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).toHaveBeenCalled();
+    });
+    it('should update the exising alert with the form values and show a error notification on error', () => {
+      spyOn(comp, 'back');
+      (systemWideAlertDataService.put as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
+      comp.currentAlert = systemWideAlert;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = {hour: 4, minute: 26};
+      comp.date = {year: 2023, month: 1, day: 25};
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.alertId = systemWideAlert.alertId;
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save();
+
+      expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).not.toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).not.toHaveBeenCalled();
+    });
+    it('should create a new alert with the form values and show a success notification on success', () => {
+      spyOn(comp, 'back');
+      comp.currentAlert = undefined;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = {hour: 4, minute: 26};
+      comp.date = {year: 2023, month: 1, day: 25};
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save();
+
+      expect(systemWideAlertDataService.create).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).toHaveBeenCalled();
+
+    });
+    it('should create a new alert with the form values and show a error notification on error', () => {
+      spyOn(comp, 'back');
+      (systemWideAlertDataService.create as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
+
+      comp.currentAlert = undefined;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = {hour: 4, minute: 26};
+      comp.date = {year: 2023, month: 1, day: 25};
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save();
+
+      expect(systemWideAlertDataService.create).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).not.toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).not.toHaveBeenCalled();
+
+    });
+  });
+  describe('back', () => {
+    it('should navigate back to the home page', () => {
+      comp.back();
+      expect(router.navigate).toHaveBeenCalledWith(['/home']);
+    });
+  });
+
+
+});
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
new file mode 100644
index 0000000000..23c9fb75f9
--- /dev/null
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -0,0 +1,254 @@
+import { Component, OnInit } from '@angular/core';
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { filter, map } from 'rxjs/operators';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { SystemWideAlert } from '../system-wide-alert.model';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+import { utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz';
+import { RemoteData } from '../../core/data/remote-data';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { Router } from '@angular/router';
+import { RequestService } from '../../core/data/request.service';
+import { TranslateService } from '@ngx-translate/core';
+
+
+/**
+ * Component responsible for rendering the form to update a system-wide alert
+ */
+@Component({
+  selector: 'ds-system-wide-alert-form',
+  styleUrls: ['./system-wide-alert-form.component.scss'],
+  templateUrl: './system-wide-alert-form.component.html'
+})
+export class SystemWideAlertFormComponent implements OnInit {
+
+  /**
+   * Observable to track an existing system-wide alert
+   */
+  systemWideAlert$: Observable<SystemWideAlert>;
+
+  /**
+   * The currently configured system-wide alert
+   */
+  currentAlert: SystemWideAlert;
+
+  /**
+   * The form group representing the system-wide alert
+   */
+  alertForm: FormGroup;
+
+  /**
+   * Date object to store the countdown date part
+   */
+  date: NgbDateStruct;
+
+  /**
+   * The minimum date for the countdown timer
+   */
+  minDate: NgbDateStruct;
+
+  /**
+   * Object to store the countdown time part
+   */
+  time;
+
+  /**
+   * Behaviour subject to track whether the counter is enabled
+   */
+  counterEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * The amount of minutes to be used in the banner preview
+   */
+  previewMinutes: number;
+
+  /**
+   * The amount of hours to be used in the banner preview
+   */
+  previewHours: number;
+
+  /**
+   * The amount of days to be used in the banner preview
+   */
+  previewDays: number;
+
+
+  constructor(
+    protected systemWideAlertDataService: SystemWideAlertDataService,
+    protected notificationsService: NotificationsService,
+    protected router: Router,
+    protected requestService: RequestService,
+    protected translateService: TranslateService
+  ) {
+  }
+
+  ngOnInit() {
+    this.systemWideAlert$ = this.systemWideAlertDataService.findAll().pipe(
+      getFirstCompletedRemoteData(),
+      map((rd) => {
+        if (rd.hasSucceeded) {
+          return rd.payload;
+        } else {
+          this.notificationsService.error('system-wide-alert-form.retrieval.error');
+        }
+      }),
+      map((payload: PaginatedList<SystemWideAlert>) => payload.page),
+      filter((page) => isNotEmpty(page)),
+      map((page) => page[0])
+    );
+    this.createForm();
+
+    const currentDate = new Date();
+    this.minDate = {year: currentDate.getFullYear(), month: currentDate.getMonth() + 1, day: currentDate.getDate()};
+
+
+    this.systemWideAlert$.subscribe((alert) => {
+      this.currentAlert = alert;
+      this.initFormValues(alert);
+    });
+  }
+
+  /**
+   * Creates the form with empty values
+   */
+  createForm() {
+    this.alertForm = new FormBuilder().group({
+        formMessage: new FormControl('', {
+          validators: [Validators.required],
+        }),
+        formActive: new FormControl(false),
+      }
+    );
+    this.setDateTime(new Date());
+  }
+
+  /**
+   * Sets the form values based on the values retrieve from the provided system-wide alert
+   * @param alert   - System-wide alert to use to init the form
+   */
+  initFormValues(alert: SystemWideAlert) {
+    this.formMessage.patchValue(alert.message);
+    this.formActive.patchValue(alert.active);
+    const countDownTo = zonedTimeToUtc(alert.countdownTo, 'UTC');
+    if (countDownTo.getTime() - new Date().getTime() > 0) {
+      this.counterEnabled$.next(true);
+      this.setDateTime(countDownTo);
+    }
+
+  }
+
+  /**
+   * Set whether the system-wide alert is active
+   * Will also save the info in the current system-wide alert
+   * @param active
+   */
+  setActive(active: boolean) {
+    this.formActive.patchValue(active);
+    this.save(false);
+  }
+
+  /**
+   * Set whether the countdown timer is enabled or disabled. This will also update the counter in the preview
+   * @param enabled   - Whether the countdown timer is enabled or disabled.
+   */
+  setCounterEnabled(enabled: boolean) {
+    this.counterEnabled$.next(enabled);
+    if (!enabled) {
+      this.previewMinutes = 0;
+      this.previewHours = 0;
+      this.previewDays = 0;
+    } else {
+      this.updatePreviewTime();
+    }
+  }
+
+
+  private setDateTime(dateToSet) {
+    this.time = {hour: dateToSet.getHours(), minute: dateToSet.getMinutes()};
+    this.date = {year: dateToSet.getFullYear(), month: dateToSet.getMonth() + 1, day: dateToSet.getDate()};
+
+    this.updatePreviewTime();
+  }
+
+  /**
+   * Update the preview time based on the configured countdown date and the current time
+   */
+  updatePreviewTime() {
+    const countDownTo = new Date(this.date.year, this.date.month - 1, this.date.day, this.time.hour, this.time.minute);
+    const timeDifference = countDownTo.getTime() - new Date().getTime();
+    this.allocateTimeUnits(timeDifference);
+  }
+
+  /**
+   * Helper method to push how many days, hours and minutes are left in the countdown to their respective behaviour subject
+   * @param timeDifference  - The time difference to calculate and push the time units for
+   */
+  private allocateTimeUnits(timeDifference) {
+    this.previewMinutes = Math.floor((timeDifference) / (1000 * 60) % 60);
+    this.previewHours = Math.floor((timeDifference) / (1000 * 60 * 60) % 24);
+    this.previewDays = Math.floor((timeDifference) / (1000 * 60 * 60 * 24));
+  }
+
+
+  get formMessage() {
+    return this.alertForm.get('formMessage');
+  }
+
+  get formActive() {
+    return this.alertForm.get('formActive');
+  }
+
+  /**
+   * Save the system-wide alert present in the form
+   * When no alert is present yet on the server, a new one will be created
+   * When one already exists, the existing one will be updated
+   *
+   * @param navigateToHomePage  - Whether the user should be navigated back on successful save or not
+   */
+  save(navigateToHomePage  = true) {
+    const alert = new SystemWideAlert();
+    alert.message = this.formMessage.value;
+    alert.active = this.formActive.value;
+    if (this.counterEnabled$.getValue()) {
+      const countDownTo = new Date(this.date.year, this.date.month - 1, this.date.day, this.time.hour, this.time.minute);
+      alert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+    } else {
+      alert.countdownTo = null;
+    }
+    if (hasValue(this.currentAlert)) {
+      const updatedAlert = Object.assign(new SystemWideAlert(), this.currentAlert, alert);
+      this.handleResponse(this.systemWideAlertDataService.put(updatedAlert), 'system-wide-alert.form.update', navigateToHomePage);
+    } else {
+      this.handleResponse(this.systemWideAlertDataService.create(alert), 'system-wide-alert.form.create', navigateToHomePage);
+    }
+  }
+
+  private handleResponse(response$: Observable<RemoteData<SystemWideAlert>>, messagePrefix, navigateToHomePage: boolean) {
+    response$.pipe(
+      getFirstCompletedRemoteData()
+    ).subscribe((response: RemoteData<SystemWideAlert>) => {
+      if (response.hasSucceeded) {
+        this.notificationsService.success(this.translateService.get(`${messagePrefix}.success`));
+        this.requestService.setStaleByHrefSubstring('systemwidealerts');
+        if (navigateToHomePage) {
+          this.back();
+        }
+      } else {
+        this.notificationsService.error(this.translateService.get(`${messagePrefix}.error`, response.errorMessage));
+      }
+    });
+  }
+
+  /**
+   * Navigate back to the homepage
+   */
+  back() {
+    this.router.navigate(['/home']);
+  }
+
+
+}
diff --git a/src/app/system-wide-alert/system-wide-alert-routing.module.ts b/src/app/system-wide-alert/system-wide-alert-routing.module.ts
new file mode 100644
index 0000000000..beb1b32187
--- /dev/null
+++ b/src/app/system-wide-alert/system-wide-alert-routing.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import {
+  SiteAdministratorGuard
+} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        canActivate: [SiteAdministratorGuard],
+        component: SystemWideAlertFormComponent,
+      },
+
+    ])
+  ]
+})
+export class SystemWideAlertRoutingModule {
+
+}
diff --git a/src/app/system-wide-alert/system-wide-alert.model.ts b/src/app/system-wide-alert/system-wide-alert.model.ts
new file mode 100644
index 0000000000..158deb2603
--- /dev/null
+++ b/src/app/system-wide-alert/system-wide-alert.model.ts
@@ -0,0 +1,55 @@
+import { autoserialize, deserialize } from 'cerialize';
+import { typedObject } from '../core/cache/builders/build-decorators';
+import { CacheableObject } from '../core/cache/cacheable-object.model';
+import { HALLink } from '../core/shared/hal-link.model';
+import { ResourceType } from '../core/shared/resource-type';
+import { excludeFromEquals } from '../core/utilities/equals.decorators';
+import { SYSTEMWIDEALERT } from './system-wide-alert.resource-type';
+
+/**
+ * Object representing a system-wide alert
+ */
+@typedObject
+export class SystemWideAlert implements CacheableObject {
+  static type = SYSTEMWIDEALERT;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The identifier for this system-wide alert
+   */
+  @autoserialize
+  alertId: string;
+
+  /**
+   * The message for this system-wide alert
+   */
+  @autoserialize
+  message: string;
+
+  /**
+   * A string representation of the date to which this system-wide alert will count down when active
+   */
+  @autoserialize
+  countdownTo: string;
+
+  /**
+   * Whether the system-wide alert is active
+   */
+  @autoserialize
+  active: boolean;
+
+
+  /**
+   * The {@link HALLink}s for this system-wide alert
+   */
+  @deserialize
+  _links: {
+    self: HALLink,
+  };
+}
diff --git a/src/app/system-wide-alert/system-wide-alert.module.ts b/src/app/system-wide-alert/system-wide-alert.module.ts
new file mode 100644
index 0000000000..ca200fa4f1
--- /dev/null
+++ b/src/app/system-wide-alert/system-wide-alert.module.ts
@@ -0,0 +1,33 @@
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { SystemWideAlertBannerComponent } from './alert-banner/system-wide-alert-banner.component';
+import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component';
+import { SharedModule } from '../shared/shared.module';
+import { SystemWideAlertDataService } from '../core/data/system-wide-alert-data.service';
+import { SystemWideAlertRoutingModule } from './system-wide-alert-routing.module';
+import { UiSwitchModule } from 'ngx-ui-switch';
+import { NgbDatepickerModule, NgbTimepickerModule } from '@ng-bootstrap/ng-bootstrap';
+
+@NgModule({
+  imports: [
+    FormsModule,
+    SharedModule,
+    UiSwitchModule,
+    SystemWideAlertRoutingModule,
+    NgbTimepickerModule,
+    NgbDatepickerModule,
+  ],
+  exports: [
+    SystemWideAlertBannerComponent
+  ],
+  declarations: [
+    SystemWideAlertBannerComponent,
+    SystemWideAlertFormComponent
+  ],
+  providers: [
+    SystemWideAlertDataService
+  ]
+})
+export class SystemWideAlertModule {
+
+}
diff --git a/src/app/system-wide-alert/system-wide-alert.resource-type.ts b/src/app/system-wide-alert/system-wide-alert.resource-type.ts
new file mode 100644
index 0000000000..f67f00719b
--- /dev/null
+++ b/src/app/system-wide-alert/system-wide-alert.resource-type.ts
@@ -0,0 +1,10 @@
+/**
+ * The resource type for SystemWideAlert
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+
+import { ResourceType } from '../core/shared/resource-type';
+
+export const SYSTEMWIDEALERT = new ResourceType('systemwidealert');
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 892f686fb8..beddc900b7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1333,7 +1333,7 @@
 
   "curation-task.task.vscan.label": "Virus Scan",
 
-  "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.register-doi.label": "Register DOI",
 
 
 
@@ -1570,7 +1570,7 @@
 
   "forgot-email.form.email.error.required": "Please fill in an email address",
 
-  "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
 
   "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
 
@@ -1950,6 +1950,48 @@
 
   "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
 
+  "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+
+  "item.edit.identifiers.doi.status.DELETED": "Deleted",
+
+  "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+
+  "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+
+  "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+
+  "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+
+  "item.edit.register-doi.header": "Register a new or pending DOI",
+
+  "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+
+  "item.edit.register-doi.confirm": "Confirm",
+
+  "item.edit.register-doi.cancel": "Cancel",
+
+  "item.edit.register-doi.success": "DOI queued for registration successfully.",
+
+  "item.edit.register-doi.error": "Error registering DOI",
+
+  "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+
   "item.edit.item-mapper.buttons.add": "Map item to selected collections",
 
   "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
@@ -3392,7 +3434,9 @@
 
   "register-page.registration.email.error.required": "Please fill in an email address",
 
-  "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+
+  "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
 
   "register-page.registration.email.hint": "This address will be verified and used as your login name.",
 
@@ -3409,6 +3453,8 @@
   "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
 
   "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
+  "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+
 
   "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
 
@@ -3417,6 +3463,7 @@
   "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
 
   "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
 
   "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
 
@@ -4339,7 +4386,17 @@
 
   "submission.sections.general.sections_not_valid": "There are incomplete sections.",
 
+  "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
 
+  "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+
+  "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+
+  "submission.sections.identifiers.handle_label": "Handle: ",
+
+  "submission.sections.identifiers.doi_label": "DOI: ",
+
+  "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
 
   "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
 
@@ -4355,6 +4412,8 @@
 
   "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
 
+  "submission.sections.submit.progressbar.identifiers": "Identifiers",
+
   "submission.sections.submit.progressbar.license": "Deposit license",
 
   "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
@@ -4978,4 +5037,53 @@
   "home.recent-submissions.head": "Recent Submissions",
 
   "listable-notification-object.default-message": "This object couldn't be retrieved",
+
+
+  "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+
+  "system-wide-alert-banner.countdown.prefix": "In",
+
+  "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+
+
+
+  "menu.section.system-wide-alert": "System-wide Alert",
+
+  "system-wide-alert.form.header": "System-wide Alert",
+
+  "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+
+  "system-wide-alert.form.cancel": "Cancel",
+
+  "system-wide-alert.form.save": "Save",
+
+  "system-wide-alert.form.label.active": "ACTIVE",
+
+  "system-wide-alert.form.label.inactive": "INACTIVE",
+
+  "system-wide-alert.form.error.message": "The system wide alert must have a message",
+
+  "system-wide-alert.form.label.message": "Alert message",
+
+  "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+
+  "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+
+  "system-wide-alert.form.label.preview": "System-wide alert preview",
+
+  "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+
+  "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+
+  "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+
+  "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+
+  "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+
+  "admin.system-wide-alert.title": "System-wide Alerts",
 }
diff --git a/src/config/cache-config.interface.ts b/src/config/cache-config.interface.ts
index c535a96bb5..9560fe46a5 100644
--- a/src/config/cache-config.interface.ts
+++ b/src/config/cache-config.interface.ts
@@ -5,6 +5,31 @@ export interface CacheConfig extends Config {
   msToLive: {
     default: number;
   };
+  // Cache-Control HTTP Header
   control: string;
   autoSync: AutoSyncConfig;
+  // In-memory caches of server-side rendered (SSR) content. These caches can be used to limit the frequency
+  // of re-generating SSR pages to improve performance.
+  serverSide: {
+    // Debug server-side caching.  Set to true to see cache hits/misses/refreshes in console logs.
+    debug: boolean,
+    // Cache specific to known bots.  Allows you to serve cached contents to bots only.
+    botCache: {
+      // Maximum number of pages (rendered via SSR) to cache. Setting max=0 disables the cache.
+      max: number;
+      // Amount of time after which cached pages are considered stale (in ms)
+      timeToLive: number;
+      // true = return page from cache after timeToLive expires. false = return a fresh page after timeToLive expires
+      allowStale: boolean;
+    },
+    // Cache specific to anonymous users. Allows you to serve cached content to non-authenticated users.
+    anonymousCache: {
+      // Maximum number of pages (rendered via SSR) to cache. Setting max=0 disables the cache.
+      max: number;
+      // Amount of time after which cached pages are considered stale (in ms)
+      timeToLive: number;
+      // true = return page from cache after timeToLive expires. false = return a fresh page after timeToLive expires
+      allowStale: boolean;
+    }
+  }
 }
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 205ea8acc0..e7851d4b34 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -67,11 +67,34 @@ export class DefaultAppConfig implements AppConfig {
     msToLive: {
       default: 15 * 60 * 1000 // 15 minutes
     },
-    control: 'max-age=60', // revalidate browser
+    // Cache-Control HTTP Header
+    control: 'max-age=604800', // revalidate browser
     autoSync: {
       defaultTime: 0,
       maxBufferSize: 100,
       timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any // time in seconds
+    },
+    // In-memory cache of server-side rendered content
+    serverSide: {
+      debug: false,
+      // Cache specific to known bots.  Allows you to serve cached contents to bots only.
+      // Defaults to caching 1,000 pages. Each page expires after 1 day
+      botCache: {
+        // Maximum number of pages (rendered via SSR) to cache. Setting max=0 disables the cache.
+        max: 1000,
+        // Amount of time after which cached pages are considered stale (in ms)
+        timeToLive: 24 * 60 * 60 * 1000, // 1 day
+        allowStale: true,
+      },
+      // Cache specific to anonymous users. Allows you to serve cached content to non-authenticated users.
+      // Defaults to caching 0 pages. But, when enabled, each page expires after 10 seconds (to minimize anonymous users seeing out-of-date content)
+      anonymousCache: {
+        // Maximum number of pages (rendered via SSR) to cache. Setting max=0 disables the cache.
+        max: 0, // disabled by default
+        // Amount of time after which cached pages are considered stale (in ms)
+        timeToLive: 10 * 1000, // 10 seconds
+        allowStale: true,
+      }
     }
   };
 
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index b323fa464d..0bb36da61f 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -55,6 +55,20 @@ export const environment: BuildConfig = {
       defaultTime: 0,
       maxBufferSize: 100,
       timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any // time in seconds
+    },
+    // In-memory cache of server-side rendered pages. Disabled in test environment (max=0)
+    serverSide: {
+      debug: false,
+      botCache: {
+        max: 0,
+        timeToLive: 24 * 60 * 60 * 1000, // 1 day
+        allowStale: true,
+      },
+      anonymousCache: {
+        max: 0,
+        timeToLive: 10 * 1000, // 10 seconds
+        allowStale: true,
+      }
     }
   },
 
diff --git a/src/index.csr.html b/src/index.csr.html
deleted file mode 100644
index b1ef4343b1..0000000000
--- a/src/index.csr.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="UTF-8">
-  <base href="/">
-  <title>DSpace</title>
-  <meta name="viewport" content="width=device-width,minimum-scale=1">
-</head>
-
-<body>
-  <ds-app></ds-app>
-</body>
-
-<!-- this is needed for CSR fallback -->
-<script async src="client.js"></script>
-
-</html>
diff --git a/src/index.html b/src/index.html
index ddd448f289..565fc0439d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -6,6 +6,7 @@
   <base href="/">
   <title>DSpace</title>
   <meta name="viewport" content="width=device-width,minimum-scale=1">
+  <meta http-equiv="cache-control" content="no-store">
 </head>
 
 <body>
diff --git a/src/main.browser.ts b/src/main.browser.ts
index d5efe828c3..68debfb355 100644
--- a/src/main.browser.ts
+++ b/src/main.browser.ts
@@ -2,21 +2,27 @@ import 'zone.js';
 import 'reflect-metadata';
 import 'core-js/es/reflect';
 
-import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { load as loadWebFont } from 'webfontloader';
 
-import { hasValue } from './app/shared/empty.util';
-
 import { BrowserAppModule } from './modules/app/browser-app.module';
 
 import { environment } from './environments/environment';
 import { AppConfig } from './config/app-config.interface';
 import { extendEnvironmentWithAppConfig } from './config/config.util';
+import { enableProdMode } from '@angular/core';
 
 const bootstrap = () => platformBrowserDynamic()
   .bootstrapModule(BrowserAppModule, {});
 
+/**
+ * We use this to determine have been serven SSR HTML or not.
+ *
+ * At this point, {@link environment} may not be in sync with the configuration.
+ * Therefore, we cannot depend on it to determine how to bootstrap the app.
+ */
+const hasTransferState = document.querySelector('script#dspace-angular-state') !== null;
+
 const main = () => {
   // Load fonts async
   // https://github.com/typekit/webfontloader#configuration
@@ -30,22 +36,23 @@ const main = () => {
     enableProdMode();
   }
 
-  if (hasValue(environment.universal) && environment.universal.preboot) {
+  if (hasTransferState) {
+    // Configuration will be taken from transfer state during initialization
     return bootstrap();
   } else {
+    // Configuration must be fetched explicitly
     return fetch('assets/config.json')
       .then((response) => response.json())
       .then((appConfig: AppConfig) => {
         // extend environment with app config for browser when not prerendered
         extendEnvironmentWithAppConfig(environment, appConfig);
-
         return bootstrap();
       });
   }
 };
 
 // support async tag or hmr
-if (document.readyState === 'complete' && hasValue(environment.universal) && !environment.universal.preboot) {
+if (document.readyState === 'complete' && !hasTransferState) {
   main();
 } else {
   document.addEventListener('DOMContentLoaded', main);
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 1135de5e93..687ecf0547 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -29,6 +29,7 @@ import { coreSelector } from '../../app/core/core.selectors';
 import { find, map } from 'rxjs/operators';
 import { isNotEmpty } from '../../app/shared/empty.util';
 import { logStartupMessage } from '../../../startup-message';
+import { MenuService } from '../../app/shared/menu/menu.service';
 
 /**
  * Performs client-side initialization.
@@ -49,6 +50,7 @@ export class BrowserInitService extends InitService {
     protected klaroService: KlaroService,
     protected authService: AuthService,
     protected themeService: ThemeService,
+    protected menuService: MenuService,
   ) {
     super(
       store,
@@ -60,6 +62,7 @@ export class BrowserInitService extends InitService {
       metadata,
       breadcrumbsService,
       themeService,
+      menuService,
     );
   }
 
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index 81426e7fcc..7d162c5fd1 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -33,6 +33,8 @@ import { Angulartics2Mock } from '../../app/shared/mocks/angulartics2.service.mo
 import { AuthRequestService } from '../../app/core/auth/auth-request.service';
 import { ServerAuthRequestService } from '../../app/core/auth/server-auth-request.service';
 import { ServerInitService } from './server-init.service';
+import { XhrFactory } from '@angular/common';
+import { ServerXhrService } from '../../app/core/services/server-xhr.service';
 
 export function createTranslateLoader(transferState: TransferState) {
   return new TranslateServerLoader(transferState, 'dist/server/assets/i18n/', '.json');
@@ -104,6 +106,10 @@ export function createTranslateLoader(transferState: TransferState) {
       provide: HardRedirectService,
       useClass: ServerHardRedirectService,
     },
+    {
+      provide: XhrFactory,
+      useClass: ServerXhrService,
+    },
   ]
 })
 export class ServerAppModule {
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 903bd91b7c..d909bb0e8d 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -20,6 +20,7 @@ import { MetadataService } from '../../app/core/metadata/metadata.service';
 import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { take } from 'rxjs/operators';
+import { MenuService } from '../../app/shared/menu/menu.service';
 
 /**
  * Performs server-side initialization.
@@ -37,6 +38,7 @@ export class ServerInitService extends InitService {
     protected metadata: MetadataService,
     protected breadcrumbsService: BreadcrumbsService,
     protected themeService: ThemeService,
+    protected menuService: MenuService,
   ) {
     super(
       store,
@@ -48,6 +50,7 @@ export class ServerInitService extends InitService {
       metadata,
       breadcrumbsService,
       themeService,
+      menuService,
     );
   }
 
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index bbb4bac298..60cbf40082 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -240,3 +240,9 @@ ds-dynamic-form-control-container.d-none {
   white-space: nowrap !important;
   border: 0 !important;
 }
+
+ul.dso-edit-menu-dropdown > li .nav-item.nav-link {
+  // ensure that links in DSO edit menu dropdowns are unstyled (li elements are styled instead to support icons)
+  padding: 0;
+  display: inline;
+}
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 591375220e..934bfdd748 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -44,6 +44,7 @@ import { CollectionListElementComponent} from './app/shared/object-list/collecti
 import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component';
 import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
+import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
 
 
 /**
@@ -88,6 +89,7 @@ const DECLARATIONS = [
         ResultsBackButtonModule,
         ItemPageModule,
         ItemSharedModule,
+    DsoPageModule,
     ],
     declarations: DECLARATIONS,
     providers: [
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 5e2055c504..aef5af00eb 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -123,6 +123,8 @@ import { ItemSharedModule } from '../../app/item-page/item-shared.module';
 import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
 import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
 import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
+import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
+import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -209,6 +211,7 @@ const DECLARATIONS = [
     InfoModule,
     JournalEntitiesModule,
     MenuModule,
+    DsoPageModule,
     MyDspaceSearchModule,
     NavbarModule,
     NgbModule,
@@ -234,6 +237,7 @@ const DECLARATIONS = [
     ResourcePoliciesModule,
     ComcolModule,
     DsoSharedModule,
+    SystemWideAlertModule
   ],
   declarations: DECLARATIONS,
   exports: [
diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts
index 6de2453917..63dff9da31 100644
--- a/src/themes/dspace/eager-theme.module.ts
+++ b/src/themes/dspace/eager-theme.module.ts
@@ -14,8 +14,7 @@ import { ResultsBackButtonModule } from '../../app/shared/results-back-button/re
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
  * This will ensure that decorator gets picked up when the app loads
  */
-const ENTRY_COMPONENTS = [
-];
+const ENTRY_COMPONENTS = [];
 
 const DECLARATIONS = [
   ...ENTRY_COMPONENTS,
@@ -36,7 +35,7 @@ const DECLARATIONS = [
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
   ],
 })
 /**
diff --git a/yarn.lock b/yarn.lock
index 2bbabcd654..2fd4fa3bc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6140,9 +6140,9 @@ htmlparser2@^6.0.0, htmlparser2@^6.1.0:
     entities "^2.0.0"
 
 http-cache-semantics@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-deceiver@^1.2.7:
   version "1.2.7"
@@ -6749,6 +6749,11 @@ isbinaryfile@^4.0.8:
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
+isbot@^3.6.5:
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.6.5.tgz#a749980d9dfba9ebcc03ee7b548d1f24dd8c9f1e"
+  integrity sha512-BchONELXt6yMad++BwGpa0oQxo/uD0keL7N15cYVf0A1oMIoNQ79OqeYdPMFWDrNhCqCbRuw9Y9F3QBjvAxZ5g==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -7468,7 +7473,7 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.7.1:
+lru-cache@^7.14.1, lru-cache@^7.7.1:
   version "7.14.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea"
   integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==