diff --git a/app/assets/images/empty-screen-illustration.png b/app/assets/images/empty-screen-illustration.png
new file mode 100644
index 000000000..98df94354
Binary files /dev/null and b/app/assets/images/empty-screen-illustration.png differ
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 71265c9f4..65fb21806 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -39,7 +39,12 @@ table {
 }
 
 #no-teams-jumbotron {
-  padding-left: 50px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+  top: 100px;
+  justify-content: center;
 }
 
 #alert-container {
diff --git a/app/javascript/vue/navigation/top_menu.vue b/app/javascript/vue/navigation/top_menu.vue
index 9bcd5147f..93bf9b602 100644
--- a/app/javascript/vue/navigation/top_menu.vue
+++ b/app/javascript/vue/navigation/top_menu.vue
@@ -6,7 +6,7 @@
         <img class="logo large" :src="logo.large_url">
       </a>
     </div>
-    <div v-if="teams" class="sci--navigation--top-menu-teams">
+    <div v-if="current_team" class="sci--navigation--top-menu-teams">
       <DropdownSelector
         :selectedValue="currentTeam"
         :options="teams"
@@ -16,7 +16,7 @@
         @dropdown:changed="switchTeam"
       />
     </div>
-    <div v-if="user" class="sci--navigation--top-menu-search left-icon sci-input-container">
+    <div v-if="user" class="sci--navigation--top-menu-search left-icon sci-input-container" :class="{'disabled' : !current_team}">
       <input type="text" class="sci-input-field" :placeholder="i18n.t('nav.search')" @change="searchValue"/>
       <i class="fas fa-search"></i>
     </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c0fe14436..885612308 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -87,6 +87,7 @@
         <% if user_signed_in? && current_user.teams.blank? && !(activities_are_selected? || settings_are_selected?) %>
           <!-- If member of no teams -->
           <div id="no-teams-jumbotron" class="jumbotron">
+            <%= image_tag "empty-screen-illustration.png", size: "500x500" %>
             <h2><%=t 'general.no_teams.title' %></h2>
             <p data-hook="general-no-teams-text"><%=t 'general.no_teams.text' %></p>
           </div>