diff --git a/public/css/modules/base/base.css b/public/css/modules/base/base.css
index 5ec7060..6a8c058 100644
--- a/public/css/modules/base/base.css
+++ b/public/css/modules/base/base.css
@@ -1,9 +1,9 @@
 @import './normalize.css';
 @import './typography.css';
 
-* {
+/* * {
 	transition: background-color 500ms ease-in-out;
-}
+} */
 
 html {
 	height: 100%;
diff --git a/public/css/modules/globals.css b/public/css/modules/globals.css
index 44d0e39..a7c3dc4 100644
--- a/public/css/modules/globals.css
+++ b/public/css/modules/globals.css
@@ -138,11 +138,6 @@ p,
 	margin-left: auto;
 }
 
-.secondary-text .material-icons {
-	font-size: 17px !important;
-	margin-left: 4px;
-}
-
 button {
 	font-family: inherit;
 	font-weight: 600;
diff --git a/public/css/modules/tabs.css b/public/css/modules/tabs.css
deleted file mode 100644
index 8a38311..0000000
--- a/public/css/modules/tabs.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.search_tabcontent,
-.main_tabcontent,
-.favorites_tabcontent {
-	display: none;
-}
-
-.main_tabcontent h1 {
-	margin-bottom: 12px;
-}
-
-.tab button {
-	background-color: var(--primary-background);
-	color: var(--main-text);
-}
-
-.tab button.active {
-	background-color: var(--accent-color);
-}
diff --git a/public/css/modules/download-tab.css b/public/css/modules/tabs/download-tab.css
similarity index 100%
rename from public/css/modules/download-tab.css
rename to public/css/modules/tabs/download-tab.css
diff --git a/public/css/modules/home-tab.css b/public/css/modules/tabs/home-tab.css
similarity index 100%
rename from public/css/modules/home-tab.css
rename to public/css/modules/tabs/home-tab.css
diff --git a/public/css/modules/main-search.css b/public/css/modules/tabs/search-tab.css
similarity index 65%
rename from public/css/modules/main-search.css
rename to public/css/modules/tabs/search-tab.css
index f16c043..4f313fd 100644
--- a/public/css/modules/main-search.css
+++ b/public/css/modules/tabs/search-tab.css
@@ -1,6 +1,19 @@
-#main_search > .search_section {
+#main_search .search_section {
 	float: none;
 	cursor: pointer;
+	border-top: 1px solid var(--separator);
+	padding-top: 20px;
+	padding-bottom: 20px;
+}
+
+/* Top Result */
+.top_result_header {
+	font-size: 2rem;
+}
+
+.search_header {
+	font-size: 1.75rem;
+	margin-bottom: 25px;
 }
 
 .top_result {
@@ -25,11 +38,17 @@
 	margin-bottom: 4px;
 }
 
-.secondary-text {
+/* Releases */
+.release .secondary-text {
 	opacity: 0.75;
 	font-size: 14px;
 }
 
+.release .secondary-text .material-icons {
+	font-size: 17px !important;
+	margin-left: 4px;
+}
+
 .release_grid {
 	display: grid;
 	grid-template-columns: repeat(auto-fill, minmax(156px, 1fr));
@@ -43,17 +62,6 @@
 	overflow-y: hidden;
 }
 
-.release {
-	display: inline-block;
-	width: 156px;
-}
-
-.release .cover_container {
-	width: 156px;
-	height: 156px;
-	margin-bottom: 10px;
-}
-
 .track_row > td > img {
 	width: 32px;
 	height: 32px;
diff --git a/public/css/modules/settings.css b/public/css/modules/tabs/settings-tab.css
similarity index 100%
rename from public/css/modules/settings.css
rename to public/css/modules/tabs/settings-tab.css
diff --git a/public/css/modules/tabs/tabs.css b/public/css/modules/tabs/tabs.css
new file mode 100644
index 0000000..62effe2
--- /dev/null
+++ b/public/css/modules/tabs/tabs.css
@@ -0,0 +1,35 @@
+@import './download-tab.css';
+@import './home-tab.css';
+@import './search-tab.css';
+@import './settings-tab.css';
+@import './tracklist-tab.css';
+
+.search_tabcontent,
+.main_tabcontent,
+.favorites_tabcontent {
+	display: none;
+}
+
+.main_tabcontent h1 {
+	margin-bottom: 12px;
+}
+
+.tab button {
+	background-color: var(--primary-background);
+	color: var(--main-text);
+}
+
+.tab button.active {
+	background-color: var(--accent-color);
+}
+
+.release {
+	display: inline-block;
+	width: 156px;
+}
+
+.release .cover_container {
+	width: 156px;
+	height: 156px;
+	margin-bottom: 10px;
+}
diff --git a/public/css/modules/tracklist-tab.css b/public/css/modules/tabs/tracklist-tab.css
similarity index 100%
rename from public/css/modules/tracklist-tab.css
rename to public/css/modules/tabs/tracklist-tab.css
diff --git a/public/css/style.css b/public/css/style.css
index 40d3271..8c7eef4 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -10,11 +10,6 @@
 
 @import './modules/sidebar.css';
 @import './modules/middle-section.css';
-@import './modules/tabs.css';
+@import './modules/tabs/tabs.css';
 @import './modules/stackedTabs.css';
-@import './modules/settings.css';
-@import './modules/main-search.css';
-@import './modules/download-tab.css';
 @import './modules/track-preview.css';
-@import './modules/tracklist-tab.css';
-@import './modules/home-tab.css';
diff --git a/public/index.html b/public/index.html
index 338b404..5336ed7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -65,19 +65,24 @@ <h2>Start searching!</h2>
 									<!-- ### Main Search Tab ### -->
 									<div id="main_search" class="search_tabcontent">
 										<template v-for="section in results.allTab.ORDER">
-											<div
+											<section
 												v-if="(section != 'TOP_RESULT' && results.allTab[section].data.length > 0) || (results.allTab[section].length > 0)"
 												class="search_section">
-												<h1 @click="changeSearchTab(section)">{{ names[section] }}</h1>
+												<h2 @click="changeSearchTab(section)" class="search_header"
+													:class="{ top_result_header : section === 'TOP_RESULT'}">
+													{{ names[section] }}
+												</h2>
 												<!-- Top result -->
 												<div v-if="section == 'TOP_RESULT'" class="top_result clickable" @click="handleClickTopResult"
 													:data-id="results.allTab.TOP_RESULT[0].id">
 													<div class="cover_container">
 														<img :src="results.allTab.TOP_RESULT[0].picture"
-															:class="(results.allTab.TOP_RESULT[0].type == 'artist' ? 'circle' : 'rounded') + ' coverart'"></img>
+															:class="(results.allTab.TOP_RESULT[0].type == 'artist' ? 'circle' : 'rounded') + ' coverart'" />
 														<div role="button" aria-label="download" @contextmenu.prevent="openQualityModal"
 															@click.stop="addToQueue" :data-link="results.allTab.TOP_RESULT[0].link"
-															class="download_overlay"><i class="material-icons">get_app</i></div>
+															class="download_overlay">
+															<i class="material-icons">get_app</i>
+														</div>
 													</div>
 													<div class="info_box">
 														<p class="primary-text">{{ results.allTab.TOP_RESULT[0].title }}</p>
@@ -150,7 +155,7 @@ <h1 @click="changeSearchTab(section)">{{ names[section] }}</h1>
 														<p class="secondary-text">{{release.NB_SONG+' tracks'}}</p>
 													</div>
 												</div>
-											</div>
+											</section>
 										</template>
 										<div
 											v-if="results.allTab.ORDER.every(section => section == 'TOP_RESULT' ? results.allTab[section].length == 0 : results.allTab[section].data.length == 0)">