diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 65338759..732ea9e6 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -49,8 +49,6 @@ CURRENT TODOs
 
 @@@@@@@@@@@ ROADMAP STAGE 2:
 
-todo: HUGE layout - go through all forms set browser to 4k ultra hd and see where things line up
-
 todo: widgets list form needs search link
 
 todo:   if (res.error != undefined)  could be changed to if(res.error) everywhere
diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js
index ad4d3901..1802dd48 100644
--- a/ayanova/src/api/gzmenu.js
+++ b/ayanova/src/api/gzmenu.js
@@ -122,7 +122,8 @@ export default {
     vm.appBar.menuItems.push({ divider: true, inset: false });
 
     //SEARCH
-    if (isCoreBizObject && ctx.icon != "fa-search") {
+    //all forms except the search form    
+    if (ctx.icon != "fa-search") {
       //For all forms but not on the search form itself; if this is necessary for others then make a nosearch or something flag controlled by incoming ctx but if not then this should suffice
       vm.appBar.menuItems.push({
         title: window.$gz.translation.get("Search"),
diff --git a/ayanova/src/views/home-search.vue b/ayanova/src/views/home-search.vue
index cc551c04..401c40b7 100644
--- a/ayanova/src/views/home-search.vue
+++ b/ayanova/src/views/home-search.vue
@@ -124,6 +124,7 @@ export default {
         vm.formState.ready = true;
         window.$gz.eventBus.$on("menu-click", clickHandler);
         generateMenu(vm);
+
         if (vm.$route.params.ayatype) {
           vm.searchObjectType = vm.$route.params.ayatype;
         }
@@ -135,7 +136,7 @@ export default {
         if (savedSettings && savedSettings.temp) {
           savedSettings = savedSettings.temp;
           if (
-            vm.searchObjectType == 0 ||
+            vm.searchObjectType == null ||
             vm.searchObjectType == savedSettings.ayaType
           ) {
             //same type or no type so go ahead and rehydrate
diff --git a/ayanova/src/views/widgets.vue b/ayanova/src/views/widgets.vue
index c197e9e8..df0f200a 100644
--- a/ayanova/src/views/widgets.vue
+++ b/ayanova/src/views/widgets.vue
@@ -76,7 +76,10 @@ function generateMenu(vm) {
     icon: "fa-vial",
     title: vm.$ay.t("WidgetList"),
     helpUrl: "form-ay-data-list-view",
-    menuItems: []
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.Widget
+    }
   };
 
   if (vm.rights.change) {