diff --git a/assets/img/genres.png b/assets/img/genres.png
new file mode 100644
index 0000000..0d8af7f
Binary files /dev/null and b/assets/img/genres.png differ
diff --git a/src/assets.html b/src/assets.html
index c496a54..614dc4f 100644
--- a/src/assets.html
+++ b/src/assets.html
@@ -38,6 +38,7 @@
 <img id="sparkImg" src="assets/img/spark.png">
 <img id="stepbackImg" src="assets/img/stepback.png">
 <img id="soundboxingImg" src="assets/img/soundboxing.png">
+<img id="genresImg" src="assets/img/genres.png">
 
 <a-mixin id="slice" slice9="color: #050505; transparent: true; opacity: 0.7; src: #sliceImg; left: 50; right: 52; top: 50; bottom: 52; padding: 0.18"></a-mixin>
 <a-mixin id="font" text="font: assets/fonts/Teko-Bold.json; shader: msdf; letterSpacing: 1"></a-mixin>
diff --git a/src/components/gpu-preloader.js b/src/components/gpu-preloader.js
index 3ffaa4d..b6ef772 100644
--- a/src/components/gpu-preloader.js
+++ b/src/components/gpu-preloader.js
@@ -18,6 +18,7 @@ AFRAME.registerComponent('gpu-preloader', {
       this.preloadSearchPrevPage();
       this.preloadWallMap();
       this.preloadWrongMap();
+      this.preloadGenres();
     }, 1000);
   },
 
@@ -85,6 +86,11 @@ AFRAME.registerComponent('gpu-preloader', {
     this.preloadTexture(wrong.getObject3D('mesh').material.map);
   },
 
+  preloadGenres: function () {
+    const genres = document.querySelector('.genreIcon');
+    this.preloadTexture(genres.getObject3D('mesh').material.map);
+  },
+
   preloadTexture: function (texture) {
     if (!texture || !texture.image) {
       console.warn('[gpu-preloader] Error preloading texture', texture);
diff --git a/src/components/search.js b/src/components/search.js
index b9c5a47..6511513 100644
--- a/src/components/search.js
+++ b/src/components/search.js
@@ -65,7 +65,7 @@ AFRAME.registerComponent('search-genre', {
     };
 
     this.el.addEventListener('click', evt => {
-      this.search(evt.target.closest('.genre').dataset.genre);
+      this.search(evt.target.closest('.genre').dataset.bindForKey);
     });
   },
 
diff --git a/src/constants/genres.js b/src/constants/genres.js
index 54335bc..4a86058 100644
--- a/src/constants/genres.js
+++ b/src/constants/genres.js
@@ -1,22 +1,23 @@
 module.exports = [
-  'Pop',
-  'R&B',
-  'Rap',
-  'Rock',
-  'Soundtrack',
-  'Video Game',
+  {name: 'Pop', row: 1, column: 1},
+  {name: 'R&B', row: 1, column: 2},
+  {name: 'Rap', row: 1, column: 3},
+  {name: 'Rock', row: 1, column: 4},
+  {name: 'Soundtrack', row: 1, column: 5},
+  {name: 'Video Game', row: 1, column: 6},
 
-  'Electronic',
-  'Hip Hop',
-  'House',
-  'J-Pop',
-  'K-Pop',
-  'Meme',
+  {name: 'Electronic', row: 2, column: 1},
+  {name: 'Hip Hop', row: 2, column: 2},
+  {name: 'House', row: 2, column: 3},
+  {name: 'J-Pop', row: 2, column: 4},
+  {name: 'K-Pop', row: 2, column: 5},
+  {name: 'Meme', row: 2, column: 6},
 
-  'Alternative',
-  'Anime',
-  'Comedy',
-  'Disney',
-  'Dubstep',
-  'EDM'
+  {name: 'Alternative', row: 3, column: 1},
+  {name: 'Anime', row: 3, column: 2},
+  {name: 'Comedy', row: 3, column: 3},
+  {name: 'Disney', row: 3, column: 4},
+  {name: 'Dubstep', row: 3, column: 5},
+  {name: 'EDM', row: 3, column: 6}
 ];
+3
\ No newline at end of file
diff --git a/src/templates/menu.html b/src/templates/menu.html
index d828bb2..dc90dd2 100644
--- a/src/templates/menu.html
+++ b/src/templates/menu.html
@@ -110,7 +110,7 @@
   <a-entity
     id="menuBackground"
     mixin="slice"
-    slice9="width: 2.5; height: 1.55; opacity: 0.9"
+    slice9="left: 70; width: 2.5; height: 1.55; opacity: 0.9"
     position="0 0 -0.005"
     raycastable></a-entity>
 
@@ -252,19 +252,37 @@
 
   <a-entity
     id="genreMenu"
-    bind-for="for: genre; in: genres; updateInPlace: true"
+    bind-for="for: genre; in: genres; updateInPlace: true; key: name"
     bind__visible="genreMenuOpen"
     layout="type: box; columns: 6; marginRow: 0.4; marginColumn: 0.4; align: center"
     search-genre>
     <template>
       <a-entity class="genre" bind-item__data-genre="item">
         <a-entity
-          geometry="primitive: plane; height: 0.35; width: 0.35"
-          material="color: #222; shader: flat"
-          animation__mouseenter1="property: components.material.material.color; type: color; from: #222; to: #444; startEvents: mouseenter; pauseEvents: mouseleave; dur: 150"
-          animation__mouseleave1="property: components.material.material.color; type: color; from: #444; to: #222; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150"
+          mixin="slice"
+          slice9="src: #slicebtnImg; color: #333; width: 0.35; left: 70; top: 70; height: 0.35; padding: 0.07"
+          animation__mouseenter1="property: slice9.color; type: color; from: #333; to: #fff; startEvents: mouseenter; pauseEvents: mouseleave; easing: easeOutCubic; dur: 150"
+          animation__mouseleave1="property: slice9.color; type: color; from: #fff; to: #333; startEvents: mouseleave; pauseEvents: mouseenter; easing: easeOutCubic; dur: 150"
+          animation__mouseenter2="property: scale; from: 1 1 1; to: 1.03 1.03 1.03; startEvents: mouseenter; pauseEvents: mouseleave; easing: easeOutCubic; dur: 150"
+          animation__mouseleave2="property: scale; from: 1.03 1.03 1.03; to: 1 1 1; startEvents: mouseleave; pauseEvents: mouseenter; easing: easeOutCubic; dur: 150"
+          proxy-event__enter="event: mouseenter; to: CHILDREN; captureBubbles: true"
+          proxy-event__leave="event: mouseleave; to: CHILDREN; captureBubbles: true"
           raycaster-target="bindToggle: genreMenuOpen; width: 0.35; height: 0.35">
-          <a-entity mixin="font" text="align: center; width: 1.1" bind-item__text="value: item" position="0 -0.04 0.001"></a-entity>
+          <a-entity
+            mixin="font"
+            text="align: center; width: 1.1; color: #555"
+            animation__mouseenter="property: text.color; from: #555; to: #fff; type: color; startEvents: mouseenter; pauseEvents: mouseleave; easing: easeOutCubic; dur: 150"
+            animation__mouseleave="property: text.color; from: #fff; to: #555; type: color; startEvents: mouseleave; pauseEvents: mouseenter; easing: easeOutCubic; dur: 150"
+            bind-item__text="value: item.name"
+            position="0 -0.16 0.001"></a-entity>
+          <a-entity
+            class="genreIcon"
+            geometry="primitive: plane; width: 0.22; height: 0.22; buffer: false; skipCache: true"
+            position="0 0.04 0.002"
+            material="shader: flat; src: #genresImg; transparent: true; opacity: 0.6; color: #fff; depthTest: false"
+            animation__mouseenter="property: material.opacity; from: 0.6; to: 1; startEvents: mouseenter; pauseEvents: mouseleave; easing: easeOutCubic; dur: 150"
+            animation__mouseleave="property: material.opacity; from: 1; to: 0.6; startEvents: mouseleave; pauseEvents: mouseenter; easing: easeOutCubic; dur: 150"
+            bind-item__atlas-uvs="totalColumns: 6; totalRows: 3; row: item.row; column: item.column"></a-entity>
         </a-entity>
       </a-entity>
     </template>