diff --git a/templates/themes/default-v2/search.html b/templates/themes/default-v2/search.html
index 7b8248e..c52e0bd 100644
--- a/templates/themes/default-v2/search.html
+++ b/templates/themes/default-v2/search.html
@@ -1,8 +1,15 @@
-{{start _results}}
-
-<a href='/watch?v={{.id}}'>
-	<img src='https://i.ytimg.com/vi/{{.id}}/mqdefault.jpg'><br>{{.title}}</a>
-	| {{.runtime}} seconds | {{.views}} views<br>
-Uploaded by <a href='/channel/{{.channel_id}}'>{{.channel}}</a><br>
-
-{{end _results}}
+{{start ?query}}
+	<h1>Results for "{{.query}}"</h1>
+	<div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));'>
+	{{start _results}}
+	<div class='video-image-container'>
+		<a href='watch?v={{.id}}'>
+			<div class='video-image' style='background-image: url(http://i.ytimg.com/vi/{{.id}}/mqdefault.jpg)'></div>
+			<b>{{.title}}</b></a><br>
+		Uploaded by <a href='/channel/{{.channel_id}}'>{{.channel}}</a> · <b>{{.runtime}}</b> · <b>{{.views}}</b> views
+	</div>
+	{{end _results}}
+	</div>
+{{else ?query}}
+<p>search for something will 'ya?</p>
+{{end ?query}}
\ No newline at end of file
diff --git a/webroot/search.shs b/webroot/search.shs
index 174402e..4cea146 100755
--- a/webroot/search.shs
+++ b/webroot/search.shs
@@ -12,6 +12,8 @@ fi
 #https://www.youtube.com/results?search_query=oooo
 if [[ "${get_data[search_query]}" ]]; then
 	query="${get_data[search_query]}"
+	meow[query]=$(sed -s 's/+/ /g' <<< "${get_data[search_query]}")
+	meow[?query]=true
 	query_nice=$(sed -s 's/+/ /g' <<< "${get_data[search_query]}")
 fi
 
@@ -34,7 +36,7 @@ if [[ "${get_data[search_query]}" ]]; then
 	for (( i=0; i<${#id[@]}; i++ )); do	
 		strings[id]="${id[$i]}"
 		strings[title]="${title[$i]}"
-		strings[runtime]="${runtime[$i]}"
+		strings[runtime]="$(date -d "@${runtime[$i]}" "+%H:%M:%S")"
 		strings[views]="${views[$i]}"
 		strings[channel_id]="${channel_id[$i]}"
 		strings[channel]="${channel[$i]}"