diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index dcf622f7..a141d42b 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -12,27 +12,41 @@
         </v-list-tile>
       </v-list>
     </v-navigation-drawer>
-    <v-toolbar
-      v-if="isAuthenticated"
-      :color="contextAppBar.isMain?'primary':'secondary'"
-      dark
-      fixed
-      app
-    >
+    <v-toolbar v-if="isAuthenticated" :color="appBar.isMain?'primary':'secondary'" dark fixed app>
       <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
       <v-toolbar-title style="width: 300px" class="ml-0 pl-3">
-        <v-icon>{{ contextAppBar.icon }}</v-icon>
-        <span>{{ contextAppBar.title}}</span>
-        <!-- <v-avatar size="32px" tile>
-          <img :src="require('./assets/logo.svg')" alt="AyaNova">
-        </v-avatar>
-        <span class="hidden-sm-and-down">AyaNova</span>-->
+        <v-icon>{{ appBar.icon }}</v-icon>&nbsp;
+        <span>{{ appBar.title}}</span>
       </v-toolbar-title>
+      <v-spacer></v-spacer>
+      <v-btn icon>
+        <v-icon>fa-save</v-icon>
+      </v-btn>
+      <v-btn icon>
+        <v-icon>fa-search</v-icon>
+      </v-btn>
+
       <!-- <v-text-field flat solo-inverted hide-details prepend-inner-icon="fa-search" label="Search"></v-text-field>
       <v-spacer></v-spacer>
       <v-btn icon v-bind:href="helpUrl" target="blank;">
         <v-icon>fa-question-circle</v-icon>
+      </v-btn>
+      <v-btn icon>
+        <v-icon>fa-ellipsis-v</v-icon>
       </v-btn>-->
+      <v-menu bottom left>
+        <template v-slot:activator="{ on }">
+          <v-btn dark icon v-on="on">
+            <v-icon>fa-ellipsis-v</v-icon>
+          </v-btn>
+        </template>
+
+        <v-list>
+          <v-list-tile v-for="(item, i) in items" :key="i">
+            <v-list-tile-title>{{ item.title }}</v-list-tile-title>
+          </v-list-tile>
+        </v-list>
+      </v-menu>
     </v-toolbar>
     <v-content>
       <v-container fluid fill-height>
@@ -63,7 +77,13 @@ export default {
   name: "App",
   data() {
     return {
-      drawer: null
+      drawer: null,
+      items: [
+        { title: "Click Me" },
+        { title: "Click Me" },
+        { title: "Click Me" },
+        { title: "Click Me 2" }
+      ]
     };
   },
   mounted() {
@@ -86,8 +106,8 @@ export default {
     navItems() {
       return this.$store.state.navItems;
     },
-    contextAppBar() {
-      return this.$store.state.contextAppBar;
+    appBar() {
+      return this.$store.state.appBar;
     },
     copyright() {
       return aboutInfo.copyright;
diff --git a/ayanova/src/store.js b/ayanova/src/store.js
index 94b278fa..8481eb04 100644
--- a/ayanova/src/store.js
+++ b/ayanova/src/store.js
@@ -19,10 +19,12 @@ export default new Vuex.Store({
     localeText: {},
     navItems: [],
     logArray: [],
-    contextAppBar: {
+    appBar: {
       isMain: true,
       icon: "",
-      title: ""
+      title: "",
+      contextMenuItems: [],
+      mainMenuItems: []
     }
   },
   mutations: {
@@ -64,11 +66,8 @@ export default new Vuex.Store({
         );
       }
     },
-    setContextAppBar(state, data) {
-      state.contextAppBar = data;
-    },
-    setAppBarMainState(state) {
-      state.contextAppBar = { isMain: true };
+    setAppBar(state, data) {
+      state.appBar = data;
     }
   },
   actions: {}
diff --git a/ayanova/src/views/About.vue b/ayanova/src/views/About.vue
index aa700299..19867683 100644
--- a/ayanova/src/views/About.vue
+++ b/ayanova/src/views/About.vue
@@ -127,7 +127,11 @@ export default {
     ]);
   },
   created() {
-    this.$store.commit("setAppBarMainState");
+    this.$store.commit("setAppBar", {
+      isMain: true,
+      icon: "fa-info-circle",
+      title: this.$gzlocale.get("HelpAboutAyaNova")
+    });
     this.clientInfo.version = aboutInfo.version;
     this.$gzapi
       .get("ServerInfo")
diff --git a/ayanova/src/views/Home.vue b/ayanova/src/views/Home.vue
index 5b87b696..76e7af74 100644
--- a/ayanova/src/views/Home.vue
+++ b/ayanova/src/views/Home.vue
@@ -9,8 +9,12 @@ export default {
   components: {
     HelloWorld
   },
-  created() {
-    this.$store.commit("setAppBarMainState");
+  beforeCreate() {
+    this.$store.commit("setAppBar", {
+      isMain: true,
+      icon: "fa-home",
+      title: this.$gzlocale.get("Home")
+    });
   }
 };
 </script>
diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue
index e6fafe69..8e16a8df 100644
--- a/ayanova/src/views/inventory-widget-edit.vue
+++ b/ayanova/src/views/inventory-widget-edit.vue
@@ -171,7 +171,7 @@ export default {
       });
   },
   created() {
-    this.$store.commit("setContextAppBar", {
+    this.$store.commit("setAppBar", {
       isMain: false,
       icon: "fa-splotch",
       title: this.$gzlocale.get("Widget")
diff --git a/ayanova/src/views/inventory.vue b/ayanova/src/views/inventory.vue
index c0cf437d..0fb061be 100644
--- a/ayanova/src/views/inventory.vue
+++ b/ayanova/src/views/inventory.vue
@@ -48,7 +48,11 @@ export default {
       });
   },
   created() {
-    this.$store.commit("setAppBarMainState");
+     this.$store.commit("setAppBar", {
+      isMain: true,
+      icon: "fa-dolly",
+      title: this.$gzlocale.get("Inventory")
+    });
   },
   components: {
     WidgetList,
diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue
index 053ceafa..c9b6b513 100644
--- a/ayanova/src/views/login.vue
+++ b/ayanova/src/views/login.vue
@@ -65,7 +65,11 @@ export default {
     };
   },
   created() {
-    this.$store.commit("setAppBarMainState");
+    this.$store.commit("setAppBar", {
+      isMain: true,
+      icon: "",
+      title: ""
+    });
   },
   methods: {
     login() {