diff --git a/src/components/panels/edit/fields/helpers/ActionButton.vue b/src/components/panels/edit/fields/helpers/ActionButton.vue
index 6de5c329..5432c867 100644
--- a/src/components/panels/edit/fields/helpers/ActionButton.vue
+++ b/src/components/panels/edit/fields/helpers/ActionButton.vue
@@ -868,7 +868,7 @@
       // Hide empty element in ad hoc mode
       hideElement: function(){
         let structure = this.profileStore.returnStructureByComponentGuid(this.guid)
-        this.emptyComponents[structure.parentId].push(structure.id)
+        this.profileStore.addToAdHocMode(structure.parentId, structure.id)
       },
 
     },
diff --git a/src/components/panels/nav/Nav.vue b/src/components/panels/nav/Nav.vue
index f1ec4ce8..5ea592ad 100644
--- a/src/components/panels/nav/Nav.vue
+++ b/src/components/panels/nav/Nav.vue
@@ -421,10 +421,14 @@
           }
         }
 
-
-
-
-
+        if (this.activeProfile.id){
+          menu.push(
+            {
+              text: "Profile: " + this.activeProfile.id,
+              class: "current-profile"
+            }
+          )
+          }
 
         menu.push(
 
@@ -557,7 +561,7 @@
             if (contents["marvaComponentLibrary"]){
               that.preferenceStore.componentLibrary = contents["marvaComponentLibrary"]
               window.localStorage.setItem('marva-componentLibrary', JSON.stringify(contents["marvaComponentLibrary"]))
-            }           
+            }
 
             if (contents["diacriticUse"]){
               that.preferenceStore.diacriticUse = contents["diacriticUse"]
@@ -610,7 +614,24 @@
       hideInstanceSelectionModal: function(){
         this.instances = []
         this.showItemInstanceSelection = false;
-      }
+      },
+
+      // Show all hidden elements
+      showAllElements: function(){
+        for (let key in this.emptyComponents){
+          this.emptyComponents[key] = []
+        }
+      },
+
+      // Hide all empty elements
+      hideAllElements: function(){
+        for (let rt in this.activeProfile.rt){
+          this.emptyComponents[rt] = []
+          for (let element in this.activeProfile.rt[rt].pt){
+            this.profileStore.addToAdHocMode(rt, element)
+          }
+        }
+      },
 
     },
 
@@ -684,6 +705,10 @@
       fill: v-bind("preferenceStore.returnValue('--c-edit-main-splitpane-nav-font-color')") !important;
     }
 
+    .current-profile {
+      background: var(--bar-button-hover-bkg, #f1f3f4);
+      margin-left: 100px;
+    }
     .login-menu{
 
       position: absolute !important;
diff --git a/src/components/panels/sidebar_property/Properties.vue b/src/components/panels/sidebar_property/Properties.vue
index befff60e..73ea69b3 100644
--- a/src/components/panels/sidebar_property/Properties.vue
+++ b/src/components/panels/sidebar_property/Properties.vue
@@ -59,7 +59,7 @@
       configComponentLibraryAssignGroup(event,clId){
         this.profileStore.changeGroupComponentLibrary(clId,event.target.value)
 
-        
+
 
       },
 
@@ -79,10 +79,10 @@
 
       },
 
-      
-      
+
+
       addComponentLibrary(event,clId,supressPropmpt){
-        
+
         if (event){
           if (this.clDebounce){return false}
           event.preventDefault()
@@ -93,7 +93,7 @@
         }
 
 
-      
+
         if (this.preferenceStore.returnValue('--b-edit-main-splitpane-properties-component-library-prompt-to-add') == true){
           if (!supressPropmpt){
             if (!confirm('Add Component From Library?')) {
@@ -109,7 +109,7 @@
         // for (let rt in this.activeProfile.rt){
         //   for (let pt in this.activeProfile.rt[rt].pt){
         //     if (this.activeProfile.rt[rt].pt[pt].id == newId){
-              
+
         //     }
         //   }
         // }
@@ -134,7 +134,7 @@
                 let r = this.addComponentLibrary(null,component.id,supressPrompt)
                 // if the first one returns canceled then stop, otherwise supress the prompt from here on
                 if (r == 'canceled'){ return false}else{supressPrompt=true}
-                
+
               }
             }
           }
@@ -227,12 +227,11 @@
 
       jumpToElement: function(profileName, elementName){
         //if it's hidden show it
-        if (this.emptyComponents[profileName].includes(elementName)){
-          let idx = this.emptyComponents[profileName].indexOf(elementName)
-          this.emptyComponents[profileName].splice(idx, 1)
-        }
+        let removed = this.profileStore.removeFromAdHocMode(profileName, elementName)
         //jump to it
-        this.activeComponent = this.activeProfile.rt[profileName].pt[elementName]
+        if (removed){
+          this.activeComponent = this.activeProfile.rt[profileName].pt[elementName]
+        }
       },
     },
   }
@@ -452,7 +451,7 @@
 
         <AccordionItem style="color: white;" :id="'accordion_'+clProfile.label" default-closed>
           <template #summary>
-            <div> <span class="material-icons" style="font-size: 18px;padding-left: 2px;">library_add</span> <span style="vertical-align: text-bottom;" class="sidebar-header-text">Library: {{ clProfile.label }}</span></div>          
+            <div> <span class="material-icons" style="font-size: 18px;padding-left: 2px;">library_add</span> <span style="vertical-align: text-bottom;" class="sidebar-header-text">Library: {{ clProfile.label }}</span></div>
           </template>
           <ul class="sidebar-property-ul" role="list">
             <template v-for="group in clProfile.groups" >
@@ -464,19 +463,19 @@
                 <template v-for="component in group">
                   <li class="sidebar-property-li sidebar-property-li-cl ">
 
-                  
+
 
                   <button :class="{'material-icons' : true, 'component-library-settings-button': true, 'component-library-settings-button-invert': (activeComponentLibrary == component.id)  }" @click="configComponentLibrary(component.id)">settings_applications</button>
 
-                  
+
 
                   <div class="component-library-item-container sidebar-property-li-empty" @click="addComponentLibrary($event,component.id)" >
                     <a href="#" @click="addComponentLibrary($event,component.id)">{{ component.label }}</a>
                   </div>
                     <template v-if="activeComponentLibrary == component.id">
                       <div class="component-library-settings">
-                        
-                        
+
+
                         <button class="material-icons simptip-position-right" data-tooltip="DELETE" @click="delComponentLibrary($event,component.id)">delete_forever</button>
                         <button class="material-icons simptip-position-right" data-tooltip="RENAME" @click="renameComponentLibrary($event,component.id,component.label)">new_label</button>
                         <select @change="configComponentLibraryAssignGroup($event,component.id)">
@@ -506,9 +505,9 @@
                           <option value="W" :selected="(component.groupId==='W')">Group W</option>
                           <option value="X" :selected="(component.groupId==='X')">Group X</option>
                           <option value="Y" :selected="(component.groupId==='Y')">Group Y</option>
-                          <option value="Z" :selected="(component.groupId==='Z')">Group Z</option>                     
+                          <option value="Z" :selected="(component.groupId==='Z')">Group Z</option>
                         </select>
-                        
+
 
                       </div>
                     </template>
@@ -531,7 +530,7 @@
     </AccordionList>
   </template>
 
-  
+
 
 
 
@@ -693,7 +692,7 @@
 .component-library-settings select{
   height: 26px;
   vertical-align: top;
-  
+
 
 }
 
diff --git a/src/stores/config.js b/src/stores/config.js
index e9e2524f..690ba4ec 100644
--- a/src/stores/config.js
+++ b/src/stores/config.js
@@ -7,7 +7,7 @@ export const useConfigStore = defineStore('config', {
 
     versionMajor: 0,
     versionMinor: 17,
-    versionPatch: 18,
+    versionPatch: 19,
 
     regionUrls: {
 
diff --git a/src/stores/profile.js b/src/stores/profile.js
index 8642e49f..19283d80 100644
--- a/src/stores/profile.js
+++ b/src/stores/profile.js
@@ -108,11 +108,11 @@ export const useProfileStore = defineStore('profile', {
       structure: null,
     },
 
-    
+
     componentLibrary : {
       profiles:{
 
-      }  
+      }
     },
 
     mostCommonNonLatinScript: null,
@@ -206,11 +206,11 @@ export const useProfileStore = defineStore('profile', {
       }
     },
 
-    
+
     /** Groups the library components into a array ready to render
-     * 
-     * @return {array} 
-     */    
+     *
+     * @return {array}
+     */
     returnComponentLibrary: (state) => {
 
       // limit to the current profiles being used
@@ -251,7 +251,7 @@ export const useProfileStore = defineStore('profile', {
 
 
       return results
-      
+
 
 
     },
@@ -4086,13 +4086,7 @@ export const useProfileStore = defineStore('profile', {
         this.activeProfile.rt[newRtId].pt[pt].parent = this.activeProfile.rt[newRtId].pt[pt].parent.replace(instanceName, newRtId)
 
         // If it's not mandatory, add it to ad hoc mode's emptyComponents list
-        if (this.activeProfile.rt[newRtId].pt[pt].mandatory != 'true'){
-          if (Object.keys(this.emptyComponents).includes(newRtId)){
-            this.emptyComponents[newRtId].push(pt)
-          } else {
-            this.emptyComponents[newRtId] = [pt]
-          }
-        }
+        this.addToAdHocMode(newRtId, pt)
       }
 
 
@@ -4179,13 +4173,7 @@ export const useProfileStore = defineStore('profile', {
         this.activeProfile.rt[newRtId].pt[pt].parent = this.activeProfile.rt[newRtId].pt[pt].parent.replace(itemName, newRtId)
 
         // If it's not mandatory, add it to ad hoc mode's emptyComponents list
-        if (this.activeProfile.rt[newRtId].pt[pt].mandatory != 'true'){
-          if (Object.keys(this.emptyComponents).includes(newRtId)){
-            this.emptyComponents[newRtId].push(pt)
-          } else {
-            this.emptyComponents[newRtId] = [pt]
-          }
-        }
+        this.addToAdHocMode(newRtId, pt)
       }
 
       // setup the new instance's properies
@@ -4596,7 +4584,6 @@ export const useProfileStore = defineStore('profile', {
 
     //Check if the component's userValue is empty
     isEmptyComponent: function(c){
-      console.info("isEmpty? ", c)
       const component = c
       const emptyArray = new Array("@root")
       const userValue = JSON.parse(JSON.stringify(component["userValue"]))
@@ -4604,7 +4591,6 @@ export const useProfileStore = defineStore('profile', {
 
       // if there is only a @root
       if (JSON.stringify(Object.keys(component.userValue)) == JSON.stringify(emptyArray)){
-          console.info("only has root")
           return true
       } else {
           // if the children only have "@..." properties
@@ -4823,14 +4809,14 @@ export const useProfileStore = defineStore('profile', {
         return false
       }
 
-      
+
       if (!this.componentLibrary.profiles[structure['parentId']]){
         this.componentLibrary.profiles[structure['parentId']] = {
           groups:[]
         }
       }
 
-      
+
       this.componentLibrary.profiles[structure['parentId']].groups.push({
         id: short.generate(),
         groupId: null,
@@ -4844,14 +4830,14 @@ export const useProfileStore = defineStore('profile', {
     },
 
     /** Writes the component library to the local storage
-     * 
+     *
      */
     saveComponentLibrary(){
       window.localStorage.setItem('marva-componentLibrary',JSON.stringify(this.componentLibrary))
     },
 
     /** Changes the group property in the storged component library data
-     * 
+     *
      */
     changeGroupComponentLibrary(id,groupId){
 
@@ -4869,9 +4855,9 @@ export const useProfileStore = defineStore('profile', {
     },
 
     /** Changes the group property in the storged component library data
-     * 
+     *
      */
-    addFromComponentLibrary(id){      
+    addFromComponentLibrary(id){
       for (let key in this.componentLibrary.profiles){
         for (let group of this.componentLibrary.profiles[key].groups){
           if (group.id == id){
@@ -4883,7 +4869,7 @@ export const useProfileStore = defineStore('profile', {
             // see if we can find its counter part in the acutal profile
             if (this.activeProfile.rt[component.parentId]){
 
-              // see if we can find the component 
+              // see if we can find the component
               let ptObjFound = false
               for (let pt in this.activeProfile.rt[component.parentId].pt){
                 if (this.activeProfile.rt[component.parentId].pt[pt].id == component.id){
@@ -4907,7 +4893,7 @@ export const useProfileStore = defineStore('profile', {
                     // there is no user data added yet
                     // we can just overwrite whats there with our component
                     // we don't need to adjust the order, its 1-for-1
-                    // find it again and overwrite                    
+                    // find it again and overwrite
                     for (let pt in this.activeProfile.rt[component.parentId].pt){
                       if (this.activeProfile.rt[component.parentId].pt[pt].id == component.id){
                         this.activeProfile.rt[component.parentId].pt[pt] = JSON.parse(JSON.stringify(component))
@@ -4915,8 +4901,8 @@ export const useProfileStore = defineStore('profile', {
                         return [component.parentId,pt]
                       }
                     }
-                    
-                    
+
+
                   }else{
 
                     // we can't replace the one that is there, already has data, so construct a new place for it
@@ -4931,7 +4917,7 @@ export const useProfileStore = defineStore('profile', {
                     let newId = component.id + "_" + (total_components+1)
 
                     let oldId = JSON.parse(JSON.stringify(component.id))
-                    
+
                     // rename it
                     component.id = newId
 
@@ -4946,7 +4932,7 @@ export const useProfileStore = defineStore('profile', {
                       }
                     }
                     this.activeProfile.rt[component.parentId].ptOrder.splice(insertAt+1, 0, newId);
-                    
+
                     return [component.parentId,newId]
                   }
 
@@ -4974,11 +4960,11 @@ export const useProfileStore = defineStore('profile', {
       }
 
     },
-    
+
     /** Removes a component from the library
-     * 
+     *
      */
-    delComponentLibrary(id){  
+    delComponentLibrary(id){
       for (let key in this.componentLibrary.profiles){
         this.componentLibrary.profiles[key].groups = this.componentLibrary.profiles[key].groups.filter((c) => { return (c.id != id) })
       }
@@ -4986,9 +4972,9 @@ export const useProfileStore = defineStore('profile', {
     },
 
     /** Renames a component's label in the library
-     * 
+     *
      */
-    renameComponentLibrary(id,newLabel){  
+    renameComponentLibrary(id,newLabel){
 
       for (let key in this.componentLibrary.profiles){
         for (let group of this.componentLibrary.profiles[key].groups){
@@ -4998,10 +4984,42 @@ export const useProfileStore = defineStore('profile', {
             return true
           }
         }
+      }
+    },
 
+    /**
+     *
+     * @param {string} profileName - name of the profile the element belongs to
+     * @param {string} element - the id of the element that will be added
+     */
+    addToAdHocMode: function(profileName, element){
+      let target = this.activeProfile.rt[profileName].pt[element]
+      let empty = this.isEmptyComponent(this.activeProfile.rt[profileName].pt[element])
+      if (empty && target.mandatory != 'true'){
+        if (Object.keys(this.emptyComponents).includes(profileName)){
+          this.emptyComponents[profileName].push(element)
+        } else {
+          this.emptyComponents[profileName] = [element]
+        }
+      } else {
+        console.warn(element, " is mandatory or populated. Didn't hide it.")
       }
-      
+    },
 
+    /**
+     *
+     * @param {string} profileName - name of the profile the element belongs to
+     * @param {string} element - the id of the element that will be removed
+     */
+    removeFromAdHocMode: function(profileName, element){
+      if (this.emptyComponents[profileName].includes(element)){
+        let idx = this.emptyComponents[profileName].indexOf(element)
+        this.emptyComponents[profileName].splice(idx, 1)
+        return true
+      } else {
+        console.warn("Couldn't find ", element, " in Ad Hoc mode: ", this.emptyComponents)
+        return false
+      }
     },
 
 
diff --git a/src/views/Load.vue b/src/views/Load.vue
index 93b7de1d..00e66243 100644
--- a/src/views/Load.vue
+++ b/src/views/Load.vue
@@ -549,10 +549,11 @@
           for (let rt in this.activeProfile.rt){
             this.emptyComponents[rt] = []
             for (let element in this.activeProfile.rt[rt].pt){
-              const e = this.activeProfile.rt[rt].pt[element]
-              if (e.mandatory != 'true'){
-                this.emptyComponents[rt].push(element)
-              }
+              // const e = this.activeProfile.rt[rt].pt[element]
+              // if (e.mandatory != 'true'){
+              //   this.emptyComponents[rt].push(element)
+              // }
+              this.profileStore.addToAdHocMode(rt, element)
             }
           }
         }