diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 682c2c7f..4effdb73 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -55,7 +55,7 @@ function initNavPanel() {
       key++,
       "license"
     );
-    addNavItem("Logout", "fa-sign-out-alt", "/login", [], key++, "logout");
+    //addNavItem("Logout", "fa-sign-out-alt", "/login", [], key++, "logout");
     window.$gz.store.commit("setHomePage", "/adm-license");
     return;
   }
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index 6349e0e0..d8c0c0e8 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -1,24 +1,128 @@
 <template>
-  <UnderConstruction />
+  <div>
+    <!-- <gz-extensions
+      :ayaType="ayType"
+      :selectedItems="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions> -->
+    <gz-data-table
+      formKey="widget-list"
+      :dataListKey="dataListKey"
+      :dataListFilter="dataListFilter"
+      :dataListSort="dataListSort"
+      :showSelect="rights.change"
+      v-on:selection-change="handleSelected"
+    >
+    </gz-data-table>
+  </div>
 </template>
 
 <script>
-import UnderConstruction from "../components/underconstruction.vue";
-
+const FORM_KEY = "notification-subscriptions";
 export default {
-  components: {
-    UnderConstruction
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.NotifySubscription);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
   },
-  beforeCreate() {
-    window.$gz.eventBus.$emit("menu-change", {
-      isMain: true,
-      icon: "fa-bullhorn",
-      title: "NotifySubscriptionList",
-      helpUrl: "form-home-notify-subscriptions",
-      formData: {
-        ayaType: window.$gz.type.NotifySubscription
-      }
-    });
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      currentListViewId: 1,
+      dataListKey: "NotifySubscriptionDataList",
+      dataListFilter: "",
+      dataListSort: "",
+      rights: window.$gz.role.defaultRightsObject(),
+      ayType: window.$gz.type.NotifySubscription,
+      selectedItems: []
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
   }
 };
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "notification-subscription-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      // case "extensions":
+      //   let res = await m.vm.$refs.extensions.open();
+      //   break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "fa-bullhorn",
+    title: "NotifySubscriptionList",
+    helpUrl: "form-home-notify-subscriptions",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.NotifySubscription
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "fa-plus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  // //STUB REPORTS
+  // //Report not Print, print is a further option
+  // menuOptions.menuItems.push({
+  //   title: "Report",
+  //   icon: "fa-file-alt",
+  //   key: FORM_KEY + ":report",
+  //   vm: vm
+  // });
+
+  // menuOptions.menuItems.push({
+  //   title: "stub: Last report used",
+  //   icon: "fa-file-alt",
+  //   key: FORM_KEY + ":report:STUBlastusedreportid",
+  //   vm: vm
+  // });
+
+  // menuOptions.menuItems.push({
+  //   title: "Extensions",
+  //   icon: "fa-puzzle-piece",
+  //   key: FORM_KEY + ":extensions",
+  //   vm: vm
+  // });
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
 </script>