diff --git a/common/common.scss b/common/common.scss
index b1b586b..001e50a 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -99,6 +99,11 @@ $max-width: 600px;
     z-index: 10;
     right: 0;
     top: 2.67em;
+    display: inline-flex;
+    align-items: center;
+    label {
+      margin-right: 1em;
+    }
   }
 
   .results {
diff --git a/common/head_tag.html b/common/head_tag.html
index b187c97..ec0257f 100644
--- a/common/head_tag.html
+++ b/common/head_tag.html
@@ -6,10 +6,12 @@
 
       api.onPageChange((url, title) => {
         var home = url === "/" || url.match(/^\/\?/) || url === homeRoute
-        if(settings.only_show_on_homepage) {
+        if(settings.show_on === "homepage") {
           var showBannerHere = home
-        } else {
+        } else if (settings.show_on === "top_menu"){
           var showBannerHere = topMenuRoutes.indexOf(url) > -1 || home
+        } else {
+          var showBannerHere = url.match(/.*/) && !url.match(/search.*/) && !url.match(/admin.*/)
         }
         if (showBannerHere){
           component.set('displaySearchBanner', true);
@@ -18,6 +20,23 @@
           component.set('displaySearchBanner', false);
           $('html').removeClass('display-search-banner');
         }
+
+        if(settings.show_for === "everyone") {
+          component.set('show_for', true);
+        } else if(settings.show_for === "logged_out" && !api.getCurrentUser()) {
+          component.set('show_for', true);
+        } else if(settings.show_for === "logged_in" && api.getCurrentUser()) {
+          component.set('show_for', true);
+        } else {
+          component.set('show_for', false);
+          $('html').removeClass('display-search-banner');
+          console.log(false);
+
+        }
+
+
+
+
       });
     }
   });
@@ -130,13 +149,17 @@
   type="text/x-handlebars"
   data-template-name="/connectors/below-site-header/search-banner"
 >
-  {{#if displaySearchBanner}}
-    <div class="custom-search-banner" >
-      <div class="wrap custom-search-banner-wrap">
-        <h1>{{theme-i18n "search_banner.headline"}}</h1>
-        <p>{{theme-i18n "search_banner.subhead"}}</p>
-        {{mount-widget widget="search-widget"}}
+
+  {{#if show_for}}
+    {{#if displaySearchBanner}}
+      <div class="custom-search-banner" >
+        <div class="wrap custom-search-banner-wrap">
+          <h1>{{theme-i18n "search_banner.headline"}}</h1>
+          <p>{{theme-i18n "search_banner.subhead"}}</p>
+          {{mount-widget widget="search-widget"}}
+        </div>
       </div>
-    </div>
+    {{/if}}
+
   {{/if}}
 </script>
diff --git a/settings.yml b/settings.yml
index 5735409..7ef6349 100644
--- a/settings.yml
+++ b/settings.yml
@@ -1,6 +1,11 @@
-only_show_on_homepage:
-  default: false
-  description: When unchecked the banner will show on all pages listed in the <a href="/admin/site_settings/category/all_results?filter=top_menu">top menu site setting</a>
+show_on:
+  default: top_menu
+  type: enum
+  choices:
+    - top_menu
+    - homepage
+    - all
+  description: top_menu refers to the <a href="/admin/site_settings/category/all_results?filter=top_menu">top menu site setting</a>
 
 background_image:
   type: string
@@ -8,3 +13,11 @@ background_image:
   description: Enter an image url
 
 tile_background_image: false
+
+show_for:
+  default: everyone
+  type: enum
+  choices:
+    - everyone
+    - logged_in
+    - logged_out