diff --git a/components/Masthead/Toolbar.vue b/components/Masthead/Toolbar.vue
index b905f960c35867411fa34671cfe2b04561079ad0..004df316291cde60596e662345c307ccfb352c7b 100644
--- a/components/Masthead/Toolbar.vue
+++ b/components/Masthead/Toolbar.vue
@@ -1,19 +1,39 @@
 <template>
-  <div class="eubopen-bar">
+  <div class="primary main-menu-container">
     <v-container>
       <v-row>
-        <v-col cols="12"> Tools </v-col>
+        <v-col
+          cols="2"
+          sm="5"
+          class="d-flex justify-center justify-sm-start align-center"
+        >
+          <LinksMenuMobile v-if="isMobile" />
+          <LinksMenu v-else />
+        </v-col>
+        <v-col cols="10" sm="7" class="d-flex justify-end align-center">
+          <EubOPENSearchBar />
+        </v-col>
       </v-row>
     </v-container>
   </div>
 </template>
 
 <script>
-export default {}
+import LinksMenuMobile from '~/components/Masthead/LinksMenuMobile.vue'
+import EubOPENSearchBar from '~/components/Masthead/EubOPENSearchBar.vue'
+import LinksMenu from '~/components/Masthead/LinksMenu.vue'
+export default {
+  components: {
+    LinksMenuMobile,
+    EubOPENSearchBar,
+    LinksMenu,
+  },
+  computed: {
+    isMobile() {
+      return this.$vuetify.breakpoint.xs
+    },
+  },
+}
 </script>
 
-<style lang="scss" scoped>
-.eubopen-bar {
-  background-color: $eubopen-primary-color;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/layouts/default.vue b/layouts/default.vue
index 5a4424050a171df09679aadd2aa967e1fe21c5aa..60450c21ce0235ac5d66ca1de19e204aaa551aef 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -6,7 +6,7 @@
         <Logo />
       </template>
     </EubopenAppBar>
-    <v-main>
+    <v-main class="main-app-content">
       <v-container>
         <nuxt />
       </v-container>
@@ -30,3 +30,8 @@ export default {
   },
 }
 </script>
+<style lang="scss" scoped>
+.main-app-content {
+  min-height: 70vh;
+}
+</style>
diff --git a/pages/compound/_id.vue b/pages/compound/_id.vue
index ee72721e839ebda8941cde502acb19a9979940f4..8db0a49a98d71f3649e425bccc2cf2c0f47ca432 100644
--- a/pages/compound/_id.vue
+++ b/pages/compound/_id.vue
@@ -11,7 +11,7 @@ export default {
   components: {
     ChemicalProbeReportCard,
   },
-  layout: 'reportCard',
+  layout: 'default',
   async asyncData({ $axios, error, params }) {
     try {
       const docSource = ['pref_name']
diff --git a/pages/compound/browse/_state.vue b/pages/compound/browse/_state.vue
index 41747b0685cd19987a3efcbdf57faf64498b61dd..fcb611eb7e624cb97cfa8764aef15502e07744bc 100644
--- a/pages/compound/browse/_state.vue
+++ b/pages/compound/browse/_state.vue
@@ -9,7 +9,7 @@ export default {
   components: {
     EBCompoundsBrowser,
   },
-  layout: 'entityBrowser',
+  layout: 'default',
   data() {
     return {
       isEmbedded: false,
diff --git a/pages/search/_term.vue b/pages/search/_term.vue
index e31c3c4b27321ff41aedd85a1d27468350653886..fec64f2fc2d9a190852578db3008979d9a112c85 100644
--- a/pages/search/_term.vue
+++ b/pages/search/_term.vue
@@ -14,7 +14,7 @@ export default {
   components: {
     FreeTextResults,
   },
-  layout: 'reportCard',
+  layout: 'default',
   computed: {
     searchTerm() {
       let searchTerm = this.$route.params.term
diff --git a/pages/target/_id.vue b/pages/target/_id.vue
index 530329e16d4b516fb84ee9e531836ee3194e4de7..6134e9ce5fb63d96e6986eb28c3c3ec8a72ee07f 100644
--- a/pages/target/_id.vue
+++ b/pages/target/_id.vue
@@ -11,7 +11,7 @@ export default {
   components: {
     TargetReportCard,
   },
-  layout: 'reportCard',
+  layout: 'default',
   async asyncData({ $axios, error, params }) {
     try {
       const docSource = ['pref_name']
diff --git a/pages/target/browse/_state.vue b/pages/target/browse/_state.vue
index dcef4eaf348bd3bf6eff6025c488bd16eddc81aa..19ac29bec8aa069814f1f2e9aad9455bf6a5e8a6 100644
--- a/pages/target/browse/_state.vue
+++ b/pages/target/browse/_state.vue
@@ -8,7 +8,7 @@ export default {
   components: {
     EBTargetsBrowser,
   },
-  layout: 'entityBrowser',
+  layout: 'default',
   data() {
     return {
       isEmbedded: false,
diff --git a/web-components-submodule b/web-components-submodule
index 3601f8c6e74825bb460a92efcabe42c1a6c2a7ae..9bfa659425ce30739e6404a67d38a55249df8729 160000
--- a/web-components-submodule
+++ b/web-components-submodule
@@ -1 +1 @@
-Subproject commit 3601f8c6e74825bb460a92efcabe42c1a6c2a7ae
+Subproject commit 9bfa659425ce30739e6404a67d38a55249df8729