diff --git a/components/mdc/action-item.vue b/components/mdc/action-item.vue
index b085919..c554ca2 100644
--- a/components/mdc/action-item.vue
+++ b/components/mdc/action-item.vue
@@ -26,6 +26,15 @@
             title: {
                 required: true,
                 type: String
+            },
+
+            rel: {
+                default: "",
+                type: String
+            },
+            target: {
+                default: "",
+                type: String
             }
         },
 
@@ -36,19 +45,18 @@
             {
                 if (this.href)
                 {
-                    return { "href": this.href };
+                    return {
+                        "href": this.href,
+                        "rel": this.rel,
+                        "target": this.target
+                    };
                 }
 
                 return { };
             },
             tag(): string
             {
-                if (this.href)
-                {
-                    return "a";
-                }
-
-                return "button";
+                return this.href ? "a" : "button";
             }
         },
 
diff --git a/components/mdc/button-item.vue b/components/mdc/button-item.vue
index 483ff13..ca5e343 100644
--- a/components/mdc/button-item.vue
+++ b/components/mdc/button-item.vue
@@ -42,6 +42,15 @@
                 type: String
             },
 
+            rel: {
+                default: "",
+                type: String
+            },
+            target: {
+                default: "",
+                type: String
+            },
+
             // Colors
             //
             secondary: {
@@ -82,19 +91,18 @@
             {
                 if (this.href)
                 {
-                    return { "href": this.href };
+                    return {
+                        "href": this.href,
+                        "rel": this.rel,
+                        "target": this.target
+                    };
                 }
 
                 return { };
             },
             tag(): string
             {
-                if (this.href)
-                {
-                    return "a";
-                }
-
-                return "button";
+                return this.href ? "a" : "button";
             }
         },
 
diff --git a/components/mdc/menus/menu-anchor.vue b/components/mdc/menus/menu-anchor.vue
deleted file mode 100644
index b456ad8..0000000
--- a/components/mdc/menus/menu-anchor.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-    <li class="mdc-list-item" role="menuitem">
-        <a :href="href"
-           :rel="rel"
-           :target="target"
-           @click="$emit('click', $event)">
-            <span ref="ripple" class="mdc-list-item__ripple"></span>
-            <span v-if="icon"
-                  class="material-icons mdc-list-item__graphic"
-                  aria-hidden="true">
-                {{ icon }}
-            </span>
-            <span class="mdc-list-item__text">
-                <slot></slot>
-            </span>
-        </a>
-    </li>
-</template>
-
-<script lang="ts">
-    import Vue from "vue";
-    import { MDCRipple } from "@material/ripple";
-
-    interface MenuAnchorData { _ripple?: MDCRipple; }
-
-    export default Vue.extend({
-        name: "MenuAnchor",
-        props: {
-            href: {
-                default: "",
-                type: String
-            },
-            icon: {
-                default: "",
-                type: String
-            },
-            rel: {
-                default: "",
-                type: String
-            },
-            target: {
-                default: "",
-                type: String
-            }
-        },
-
-        data: (): MenuAnchorData => ({ }),
-        mounted: function(): void
-        {
-            this._ripple = new MDCRipple(this.$el);
-        }
-    });
-</script>
-
-<style lang="scss" scoped>
-    @use "~@/assets/scss/variables";
-
-    .mdc-list-item
-    {
-        & > a
-        {
-            color: variables.$not-quite-black;
-            outline: none;
-            text-decoration: none;
-        }
-    }
-</style>
diff --git a/components/mdc/menus/menu-item.vue b/components/mdc/menus/menu-item.vue
index b71512a..78c9fdc 100644
--- a/components/mdc/menus/menu-item.vue
+++ b/components/mdc/menus/menu-item.vue
@@ -1,17 +1,25 @@
 <template>
-    <li class="mdc-list-item"
-        role="menuitem"
-        @click="$emit('click', $event)"
-        @keydown.enter="$emit('click', $event)">
-        <span ref="ripple" class="mdc-list-item__ripple"></span>
-        <span v-if="icon"
-              class="material-icons mdc-list-item__graphic"
-              aria-hidden="true">
-            {{ icon }}
-        </span>
-        <span class="mdc-list-item__text">
-            <slot></slot>
-        </span>
+    <li>
+        <component :is="tag"
+                   ref="item"
+                   class="mdc-list-item"
+                   role="menuitem"
+                   v-bind="properties"
+                   :alt="title"
+                   :title="title"
+                   :aria-label="title"
+                   @click="$emit('click', evt)"
+                   @keydown.enter="$emit('click', evt)">
+            <span ref="ripple" class="mdc-list-item__ripple"></span>
+            <span v-if="icon"
+                  class="material-icons mdc-list-item__graphic"
+                  aria-hidden="true">
+                {{ icon }}
+            </span>
+            <span class="mdc-list-item__text">
+                <slot></slot>
+            </span>
+        </component>
     </li>
 </template>
 
@@ -24,19 +32,71 @@
     export default Vue.extend({
         name: "MenuItem",
         props: {
+            href: {
+                default: "",
+                type: String
+            },
+
+            title: {
+                default: "",
+                type: String
+            },
             icon: {
                 default: "",
                 type: String
+            },
+
+            rel: {
+                default: "",
+                type: String
+            },
+            target: {
+                default: "",
+                type: String
             }
         },
 
         data: (): MenuItemData => ({ }),
+
+        computed: {
+            properties(): Record<string, string>
+            {
+                if (this.href)
+                {
+                    return {
+                        "href": this.href,
+                        "rel": this.rel,
+                        "target": this.target
+                    };
+                }
+
+                return { };
+            },
+            tag(): string
+            {
+                return this.href ? "a" : "div";
+            }
+        },
+
         mounted: function(): void
         {
-            this._ripple = new MDCRipple(this.$el);
+            this._ripple = new MDCRipple(this.$refs.item as Element);
         }
     });
 </script>
 
 <style lang="scss" scoped>
+    @use "~@/assets/scss/variables";
+
+    .mdc-list-item
+    {
+        color: variables.$not-quite-black;
+        outline: none;
+        text-decoration: none;
+
+        &:hover
+        {
+            text-decoration: none;
+        }
+    }
 </style>
diff --git a/components/overflow-menu.vue b/components/overflow-menu.vue
index 629d4c8..bd5cc85 100644
--- a/components/overflow-menu.vue
+++ b/components/overflow-menu.vue
@@ -6,26 +6,15 @@
             more_vert
         </span>
         <Menu v-model="isOpen">
-            <template v-for="action in actions">
-                <template v-if="action.path">
-                    <NuxtLink :key="action.id"
-                              v-slot="{ href, navigate }"
-                              custom
-                              :to="action.path">
-                        <MenuAnchor :href="href"
-                                    rel="nofollow noopener noreferrer"
-                                    target="_blank"
-                                    @click="navigate">
-                            {{ action.title }}
-                        </MenuAnchor>
-                    </NuxtLink>
-                </template>
-                <template v-else>
-                    <MenuItem :key="action.id" @click="$emit('select', action, $event)">
-                        {{ action.title }}
-                    </MenuItem>
-                </template>
-            </template>
+            <MenuItem v-for="action in actions"
+                      :key="action.id"
+                      :href="action.path"
+                      :title="action.title"
+                      rel="nofollow noopener noreferrer"
+                      target="_blank"
+                      @click="onClick(action, $event)">
+                {{ action.title }}
+            </MenuItem>
         </Menu>
     </ActionItem>
 </template>
@@ -33,16 +22,17 @@
 <script lang="ts">
     import Vue from "vue";
 
+    import { Menu as Action } from "@/core/types";
+
     import ActionItem from "./mdc/action-item.vue";
     import Menu from "./mdc/menus/menu.vue";
-    import MenuAnchor from "./mdc/menus/menu-anchor.vue";
     import MenuItem from "./mdc/menus/menu-item.vue";
 
     interface OverflowMenuData { isOpen: boolean; }
 
     export default Vue.extend({
         name: "OverflowMenu",
-        components: { ActionItem, Menu, MenuAnchor, MenuItem },
+        components: { ActionItem, Menu, MenuItem },
         props: {
             actions: {
                 default: () => [],
@@ -60,6 +50,14 @@
             toggleMenu(): void
             {
                 this.isOpen = !this.isOpen;
+            },
+
+            onClick(action: Action, evt: Event): void
+            {
+                if (!action.path)
+                {
+                    this.$emit("select", action, evt);
+                }
             }
         }
     });
diff --git a/layouts/default.vue b/layouts/default.vue
index 0faf669..3e7d995 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -50,10 +50,10 @@
     {
         _body?: HTMLElement;
 
-        dialog: boolean;
         isModal: boolean;
         isOpen: boolean;
         toggler: boolean;
+        openDialogs: number;
 
         margin: number;
 
@@ -75,10 +75,10 @@
         },
 
         data: (): DrawerLayoutData => ({
-            dialog: false,
             isModal: false,
             isOpen: false,
             toggler: true,
+            openDialogs: 0,
 
             margin: 0,
 
@@ -98,11 +98,11 @@
         watch: {
             isOpen(value: boolean, oldValue: boolean): void
             {
-                this.disable(!(this.isModal && value) && !this.dialog);
+                this.disable((this.isModal && value) || !!(this.openDialogs));
             },
-            dialog(value: boolean, oldValue: boolean): void
+            openDialogs(value: boolean, oldValue: boolean): void
             {
-                this.disable(!(this.isModal && this.isOpen) && !value);
+                this.disable((this.isModal && this.isOpen) || !!(value));
             }
         },
 
@@ -126,11 +126,11 @@
             {
                 if (disabled)
                 {
-                    this._body!.removeAttribute("disabled");
+                    this._body!.setAttribute("disabled", "");
                 }
                 else
                 {
-                    this._body!.setAttribute("disabled", "");
+                    this._body!.removeAttribute("disabled");
                 }
             },
 
@@ -187,9 +187,16 @@
 
                 this.margin = (this.$refs.flooter as Vue).$el.clientHeight;
             },
-            onDialogOpen(value: boolean): void
+            onDialogOpen(isOpen: boolean): void
             {
-                this.dialog = value;
+                if (isOpen)
+                {
+                    this.openDialogs += 1;
+                }
+                else
+                {
+                    this.openDialogs -= 1;
+                }
             },
 
             closeDrawer(evt: MouseEvent): void