diff --git a/src/routes/Discover/PickerMenu.js b/src/routes/Discover/PickerMenu.js
index 302aa8c07..bde09a305 100644
--- a/src/routes/Discover/PickerMenu.js
+++ b/src/routes/Discover/PickerMenu.js
@@ -3,10 +3,9 @@ const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Icon = require('stremio-icons/dom');
 const { Input } = require('stremio-navigation');
-const { Popup, useBinaryState } = require('stremio-common');
+const { Popup, useBinaryState } = require('stremio/common');
 const styles = require('./styles');
 
-// TODO support optionsLimit
 const PickerMenu = ({ name, value, options, toggle }) => {
     const [open, onOpen, onClose] = useBinaryState(false);
     const label = typeof value === 'string' ? value : name;
@@ -18,8 +17,8 @@ const PickerMenu = ({ name, value, options, toggle }) => {
                     <Icon className={styles['picker-icon']} icon={'ic_arrow_down'} />
                 </Input>
             </Popup.Label>
-            <Popup.Menu className={styles['menu-layer']}>
-                <div className={styles['menu-container']}>
+            <Popup.Menu className={styles['menu-container']}>
+                <div className={styles['menu-content']}>
                     {
                         Array.isArray(options) ?
                             options.map(({ value, label }) => (
diff --git a/src/routes/Discover/styles.less b/src/routes/Discover/styles.less
index 7ea7c389f..1721af592 100644
--- a/src/routes/Discover/styles.less
+++ b/src/routes/Discover/styles.less
@@ -1,13 +1,8 @@
-.discover-container, .menu-layer {
-    font-size: 14px;
-    --items-per-row: 10;
-}
-
 .discover-container {
-    width: 100%;
-    height: 100%;
     display: flex;
     flex-direction: column;
+    width: 100%;
+    height: 100%;
     background-color: var(--color-background);
 
     .nav-bar {
@@ -27,6 +22,9 @@
 
         .pickers-container {
             grid-area: pickers-area;
+            display: flex;
+            flex-direction: row;
+            flex-flow: wrap;
             padding: 0.4em;
 
             .picker-button {
@@ -34,7 +32,7 @@
                 height: 3em;
                 margin: 0.4em;
                 padding: 0 0.8em;
-                display: inline-flex;
+                display: flex;
                 flex-direction: row;
                 align-items: center;
                 background-color: var(--color-backgroundlighter);
@@ -102,11 +100,11 @@
     }
 }
 
-.menu-layer {
+.menu-container {
     --border-color: var(--color-backgroundlighter40);
     --box-shadow: -0.6em 0.6em 0.5em -0.1em var(--color-backgrounddark40);
 
-    .menu-container {
+    .menu-content {
         width: 16em;
         background-color: var(--color-backgroundlighter);
 
@@ -129,4 +127,52 @@
             }
         }
     }
+}
+
+@media only screen and (max-width: 1000px) {
+    .discover-container, .menu-container {
+        font-size: 14px;
+        --items-per-row: 5;
+
+        .discover-content {
+            grid-template-areas:
+                "pickers-area pickers-area"
+                "meta-items-area meta-items-area";
+        }
+    }
+}
+
+@media only screen and (min-width: 1000px) and (max-width: 1200px) {
+    .discover-container, .menu-container {
+        font-size: 14px;
+        --items-per-row: 4;
+    }
+}
+
+@media only screen and (min-width: 1200px) and (max-width: 1400px) {
+    .discover-container, .menu-container {
+        font-size: 16px;
+        --items-per-row: 5;
+    }
+}
+
+@media only screen and (min-width: 1400px) and (max-width: 1600px) {
+    .discover-container, .menu-container {
+        font-size: 16px;
+        --items-per-row: 6;
+    }
+}
+
+@media only screen and (min-width: 1600px) and (max-width: 2000px) {
+    .discover-container, .menu-container {
+        font-size: 18px;
+        --items-per-row: 7;
+    }
+}
+
+@media only screen and (min-width: 2000px) {
+    .discover-container, .menu-container {
+        font-size: 18px;
+        --items-per-row: 8;
+    }
 }
\ No newline at end of file