diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index ae5bdffe..3d5a6a97 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -47,8 +47,7 @@ CURRENT TODOs
 
 SHELL / NAV / MENUS / LAYOUT
 
-TODO: MEMO sb MEMOS in user menu
-TODO: Set password using wrong icon
+
 TODO: help for svc schedule giong to user schedule sb form-svc-schedule
 TODO: See if there is an alternate accounting logo without the dollar sign that can be used
 TODO: NOtification subscriptions and ops notification settings using same logo, is there a more suitable ops settings one because the user one is fine (bullhorn)
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index c9c4d767..38b8fcf6 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -42,14 +42,14 @@ export default function initialize() {
           //SCHEDULE (personal)
           sub.push({
             title: window.$gz.locale.get("Schedule"),
-            icon: "calendar-alt",
-            route: "/schedule/me", //Note: "me" is code for current user id in schedule form, any single user id can be substituted for me as well
+            icon: "calendar-day",
+            route: "/home-schedule",
             key: key++
           });
 
           //MEMOS
           sub.push({
-            title: window.$gz.locale.get("Memo"),
+            title: window.$gz.locale.get("MemoList"),
             icon: "inbox",
             route: "/memo",
             key: key++
@@ -146,7 +146,7 @@ export default function initialize() {
           sub.push({
             title: window.$gz.locale.get("Schedule"),
             icon: "calendar-alt",
-            route: "/schedule/all",
+            route: "/svc-schedule",
             key: key++
           });
 
diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js
index 966ab996..bb0ccf9d 100644
--- a/ayanova/src/api/locale.js
+++ b/ayanova/src/api/locale.js
@@ -50,7 +50,7 @@ export default {
     "Home",
     "DashboardDashboard",
     "Schedule",
-    "Memo",
+    "MemoList",
     "Locale",
     "SetLoginPassword",
     "NotifySubscriptionList",
diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index 373278e9..fdc40935 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -77,10 +77,10 @@ export default new Router({
         import(/* webpackChunkName: "aybase" */ "./views/dashboard.vue")
     },
     {
-      path: "/schedule/:scopeid",
-      name: "schedule",
+      path: "/home-schedule",
+      name: "home-schedule",
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/schedule.vue")
+        import(/* webpackChunkName: "aybase" */ "./views/home-schedule.vue")
     },
     {
       path: "/memo",
@@ -126,6 +126,12 @@ export default new Router({
       component: () =>
         import(/* webpackChunkName: "customer" */ "./views/headoffices.vue")
     },
+    {
+      path: "/svc-schedule",
+      name: "svc-schedule",
+      component: () =>
+        import(/* webpackChunkName: "aybase" */ "./views/svc-schedule.vue")
+    },
     {
       path: "/workorders",
       name: "workorders",
diff --git a/ayanova/src/views/change-pw.vue b/ayanova/src/views/change-pw.vue
index a99c66f6..00745c49 100644
--- a/ayanova/src/views/change-pw.vue
+++ b/ayanova/src/views/change-pw.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "language",
+      icon: "key",
       title: window.$gz.locale.get("SetLoginPassword"),
       helpUrl: "form-home-password"
     });
diff --git a/ayanova/src/views/schedule.vue b/ayanova/src/views/home-schedule.vue
similarity index 93%
rename from ayanova/src/views/schedule.vue
rename to ayanova/src/views/home-schedule.vue
index d8a9e835..f3e6df62 100644
--- a/ayanova/src/views/schedule.vue
+++ b/ayanova/src/views/home-schedule.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "calendar-alt",
+      icon: "calendar-day",
       title: window.$gz.locale.get("Schedule"),
       helpUrl: "form-home-schedule"
     });
diff --git a/ayanova/src/views/svc-schedule.vue b/ayanova/src/views/svc-schedule.vue
new file mode 100644
index 00000000..cf0282fe
--- /dev/null
+++ b/ayanova/src/views/svc-schedule.vue
@@ -0,0 +1,21 @@
+<template>
+  <UnderConstruction />
+</template>
+
+<script>
+import UnderConstruction from "../components/underconstruction.vue";
+
+export default {
+  components: {
+    UnderConstruction
+  },
+  beforeCreate() {
+    window.$gz.eventBus.$emit("menu-change", {
+      isMain: true,
+      icon: "calendar-alt",
+      title: window.$gz.locale.get("Schedule"),
+      helpUrl: "form-svc-schedule"
+    });
+  }
+};
+</script>