diff --git a/client/ListItems/listItemsForm.html b/client/ListItems/listItemsForm.html
index 15220e0..1e71cb4 100644
--- a/client/ListItems/listItemsForm.html
+++ b/client/ListItems/listItemsForm.html
@@ -1,7 +1,9 @@
 <template name="listItemsForm">
   <div class="row">
     <div class="col s6 center">
+      {{#if Template.subscriptionsReady}}
       <h5>{{selListName}}</h5>
+      {{/if}}
     </div>
     <div class="col s6">
       <div class="row">
diff --git a/client/ListItems/listItemsForm.js b/client/ListItems/listItemsForm.js
index 4c2a90e..678fe85 100644
--- a/client/ListItems/listItemsForm.js
+++ b/client/ListItems/listItemsForm.js
@@ -34,7 +34,13 @@ Template.listItemsForm.helpers({
         if (Session.get("listId")) {
             selListId = Session.get("listId");
         } else {
-            selListId = UserLast.findOne({ view: "List", userId: Meteor.userId() }).viewId;
+            selListInfo = UserLast.findOne({ view: "List" });
+            if (selListInfo) {
+                selListId = selListInfo.viewId;
+                Session.set("listId", selListId);
+            } else {
+                console.log("not finding any value for viewId.");
+            }
         }
         let listInfo = Lists.findOne({ _id: selListId });
         if (listInfo) {
diff --git a/client/ListItems/listItemsTbl.html b/client/ListItems/listItemsTbl.html
index cd2d486..cb61be1 100644
--- a/client/ListItems/listItemsTbl.html
+++ b/client/ListItems/listItemsTbl.html
@@ -2,6 +2,7 @@
     <div class="row">
         <div class="col s12">
             <ul class="collection">
+                {{#if Template.subscriptionsReady}}
                 {{#each thisListItems}}
                     <li class="collection-item">
                         <span>
@@ -15,6 +16,7 @@
                         <i class="material-icons clickable markListItemReceived right">check</i>
                     </li>
                 {{/each}}
+                {{/if}}
             </ul>
         </div>
     </div>
diff --git a/client/ListItems/listItemsTbl.js b/client/ListItems/listItemsTbl.js
index 374c3ba..314ae0f 100644
--- a/client/ListItems/listItemsTbl.js
+++ b/client/ListItems/listItemsTbl.js
@@ -15,14 +15,6 @@ Template.listItemsTbl.onRendered(function() {
     
     Session.set("showReceivedItems", false);
     Session.set("searchVal", "");
-
-    if (Session.get("listId")) {
-        console.log("got List Id in Session var.");
-        // no action
-    } else {
-        let selListId = UserLast.find({ view: "List" }).listId;
-        Session.set("listId", selListId);
-    }
 });
 
 Template.listItemsTbl.helpers({
diff --git a/client/MenuItems/menuItemsForm.js b/client/MenuItems/menuItemsForm.js
index 17f1b5e..5e5b6d6 100644
--- a/client/MenuItems/menuItemsForm.js
+++ b/client/MenuItems/menuItemsForm.js
@@ -2,10 +2,12 @@ import { MenuItems } from '../../imports/api/menuItems.js';
 import { Menus } from '../../imports/api/menu.js';
 import moment from 'moment';
 import { M } from '../lib/assets/materialize.js';
+import { UserLast } from '../../imports/api/userLast.js';
 
 Template.menuItemsForm.onCreated(function() {
     this.subscribe("myMenus");
     this.subscribe("allMenuItems", Session.get("menuId"));
+    this.subscribe("userLastView");
 });
 
 Template.menuItemsForm.onRendered(function() {
@@ -29,10 +31,17 @@ Template.menuItemsForm.helpers({
         return Session.get("menuItemErr");
     },
     menuName: function() {
-        let menuId = Session.get("menuId");
+        let menuId  = "";
+        if (Session.get("menuId")) {
+            menuId = Session.get("menuId");
+        } else {
+            menuId = UserLast.findOne({ view: "Menu" }).viewId;
+        }
+        
         let menuInfo = Menus.findOne({ _id: menuId });
-        let menuName = menuInfo.menuName;
-        return menuName;
+        if (menuInfo) {
+            return menuInfo.menuName;
+        }
     }
 });
 
diff --git a/client/MenuItems/menuItemsTbl.js b/client/MenuItems/menuItemsTbl.js
index 48d480f..fb01e79 100644
--- a/client/MenuItems/menuItemsTbl.js
+++ b/client/MenuItems/menuItemsTbl.js
@@ -1,10 +1,12 @@
 import { MenuItems } from '../../imports/api/menuItems.js';
 import { M } from '../lib/assets/materialize.js';
+import { UserLast } from '../../imports/api/userLast.js';
 
 Template.menuItemsTbl.onCreated(function() {
     this.autorun( () => {
         this.subscribe("myMenuItems", Session.get("menuId"));
     });
+    this.subscribe("userLastView");
 });
 
 Template.menuItemsTbl.onRendered(function() {
@@ -22,7 +24,16 @@ Template.menuItemsTbl.onRendered(function() {
 
 Template.menuItemsTbl.helpers({
     thisMenuItems: function() {
-        return MenuItems.find({ menuId: Session.get("menuId") }, { sort: { serveDateActual: 1 }});
+        let menuId = "";
+        if (Session.get("menuId")) {
+            menuId = Session.get("menuId");
+        } else {
+            menuId = UserLast.findOne({ view: "Menu" }).viewId;
+        }
+        let menuInfo = MenuItems.find({ menuId: menuId }, { sort: { serveDateActual: 1 }});
+        if (menuInfo) {
+            return menuInfo
+        }
     }
 });
 
@@ -40,7 +51,7 @@ Template.menuItemsTbl.events({
     },
     'click .addProdsToList' (event) {
         event.preventDefault();
-        console.log("Menu Iteme Id sent is: " + this._id);
+        // console.log("Menu Iteme Id sent is: " + this._id);
         Session.set("menuItemId", this._id);
     }
 });
\ No newline at end of file
diff --git a/client/Menus/mainMenuTbl.js b/client/Menus/mainMenuTbl.js
index f242f50..0ae96b7 100644
--- a/client/Menus/mainMenuTbl.js
+++ b/client/Menus/mainMenuTbl.js
@@ -28,11 +28,17 @@ Template.mainMenuTbl.events({
             if (menuId == "addMenu") {
                 // console.log("add menu clicked");
             } else {
-                console.log("menuId is: " + menuId);
-                Session.set("menuId", menuId);
-                Meteor.setTimeout(function() {
-                    FlowRouter.go('/menuitems');
-                }, 100);  
+                // console.log("menuId is: " + menuId);
+                Meteor.call('add.userLast', "Menu", menuId, function(err, result) {
+                    if (err) {
+                        console.log("    ERROR writing last menu viewed by user to db: " + err);
+                    } else {
+                        Session.set("menuId", menuId);
+                        Meteor.setTimeout(function() {
+                            FlowRouter.go('/menuitems');
+                        }, 100);  
+                    }
+                });
             }
         } else if (sender.localName == "i") {
             let menuId = this._id;