diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 0000000..de399d5
Binary files /dev/null and b/static/favicon.ico differ
diff --git a/templates/home.html b/templates/home.html
index 6ebb010..5a36779 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -1,15 +1,15 @@
-{{define "title"}}
+{{define "title" -}}
 <title>Serverlist :: {{.Region}}</title>
-{{end}}
+{{- end}}
 
-{{define "content"}}
+{{define "content" -}}
 {{ $gamemodes := .Gamemodes}}
 {{ $servers := .Servers}}
 {{ $flags := .Flags}}
 <div class="container mx-auto px-4 sm:px-8">
     <div class="py-8">
         <div>
-            <h2 class="text-2xl font-semibold leading-tight">{{.Region}}</h2>
+            <h2 class="text-2xl font-semibold leading-tight text-white">{{.Region}}</h2>
         </div>
         {{range $gamemode := $gamemodes -}}
         <div class="-mx-4 sm:-mx-8 px-4 sm:px-8 py-4 overflow-x-auto">
@@ -35,6 +35,7 @@
                     <tbody>
                       {{range $server := $servers -}}
                         {{if eq $gamemode.ID $server.GamemodeID -}}
+                        {{if ne $server.Map "Server didn't reply." -}}
                         <tr id="content">
                             <td class="px-5 border-b border-gray-200 bg-white" id="flag">
                                   {{range $flag := $flags -}}
@@ -58,6 +59,7 @@
                             </td>
                         </tr>
                         {{- end}}
+                        {{- end}}
                       {{- end}}
                     </tbody>
                 </table>
@@ -67,4 +69,4 @@
     </div>
 </div>
 </section>
-{{end}}
+{{- end}}
diff --git a/templates/layout.html b/templates/layout.html
index 80ca230..ebdbf5f 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -1,10 +1,21 @@
 <!DOCTYPE html> 
-<html lang="en"><head>
-    {{block "title" .}}{{end}}
+<html class="bg-gray-800" lang="en"><head>
+    {{block "title" . -}}{{- end}}
+    <meta http-equiv="content-Type" content="text/html; utf-8" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta name="robots" content="INDEX,FOLLOW" />
+    <meta http-equiv="content-Language" content="en" />
+    <meta name="description" content="Serverlist for competitive Team Fortress 2 players" />
+    <meta name="keywords" content="tf2, tf, serverlist, team, fortress, 2" />
+    <meta name="page-type" content="Game" />
+    <meta name="page-topic" content="Team Fortress 2" />
+    <meta http-equiv="Reply-to" content="" />
+    <meta name="expires" content="" />
+    <meta name="revisit-after" content="2 days" />
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" type="image/x-icon" href="https://spenny.tf/favicon.ico"/>
+    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"/>
     <link href="https://unpkg.com/tailwindcss@1.0.4/dist/tailwind.min.css" rel="stylesheet">
     <script async defer data-website-id="084ca01d-5337-4f12-8932-3033addbc175" src="https://a.v0v.de/t.js"></script>
     <script defer data-domain="serverlist.tf" src="https://t.v0v.de/js/t.js"></script>
@@ -20,7 +31,7 @@
         }
     </style>
 </head>
-<body class="max-w-screen-xl px-4 py-12 mx-auto space-y-8 sm:px-6 lg:px-8" style="background: #edf2f7;">
+<body class="max-w-screen-xl px-4 py-12 mx-auto space-y-8 sm:px-6 lg:px-8 bg-gray-800">
     <section class="container mx-auto px-8 my-1 flex flex-wrap -m-4">
     <div class="p-2 md:w-40">
         <a href="/" class="flex items-center p-4 bg-blue-200 rounded-lg shadow-xs cursor-pointer hover:bg-blue-500 hover:text-gray-100">
@@ -57,14 +68,14 @@
             </div>
         </a>
     </div>
-    {{block "content" .}}{{end}}
+    {{block "content" . -}}{{- end}}
 </body>
 <!-- Foooter -->
 <section class="bg-white rounded-lg">
     <div class="max-w-screen-xl px-4 py-12 mx-auto space-y-8 overflow-hidden sm:px-6 lg:px-8">
         <nav class="flex flex-wrap justify-center -mx-5 -my-2">
 			<div class="px-5 py-2">
-                <a href="https://spenny.tf/discord" class="text-base leading-6 text-gray-500 hover:text-gray-900">
+                <a href="https://discord.gg/MfeXJkWg5m" class="text-base leading-6 text-gray-500 hover:text-gray-900">
                     Add server
                 </a>
             </div>
diff --git a/templates/region.html b/templates/region.html
index 1c3c302..6d9d0c9 100644
--- a/templates/region.html
+++ b/templates/region.html
@@ -10,7 +10,7 @@
 <div class="container mx-auto px-4 sm:px-8">
     <div class="py-8">
         <div>
-            <h2 class="text-2xl font-semibold leading-tight">{{.Region}}</h2>
+            <h2 class="text-2xl font-semibold leading-tight text-white">{{.Region}}</h2>
         </div>
       {{range $gamemode := $gamemodes -}}
        {{range $gamemodeCount := $gamemodesCount -}}
@@ -38,6 +38,7 @@
                     <tbody>
                       {{range $server := $servers -}}
                         {{if eq $gamemode.ID $server.GamemodeID -}}
+                        {{if ne $server.Map "Server didn't reply." -}}
                         <tr id="content">
                             <td class="px-5 border-b border-gray-200 bg-white" id="flag">
                                   {{range $flag := $flags -}}
@@ -61,6 +62,7 @@
                             </td>
                         </tr>
                         {{- end}}
+                        {{- end}}
                       {{- end}}
                     </tbody>
                 </table>
diff --git a/web/handler.go b/web/handler.go
index 505906e..7e1503f 100644
--- a/web/handler.go
+++ b/web/handler.go
@@ -17,6 +17,7 @@ func NewHandler(store steamServer.Store) *Handler {
 
     h.Use(middleware.Logger)
 
+    h.Get("/favicon.ico", faviconHandler)
     h.Get("/", h.Home())
     h.Get("/europe", h.Europe())
     h.Get("/america", h.America())
@@ -32,6 +33,10 @@ type Handler struct {
     store steamServer.Store
 }
 
+func faviconHandler(w http.ResponseWriter, r *http.Request) {
+    http.ServeFile(w, r, "static/favicon.ico")
+}
+
 func (h *Handler) Home() http.HandlerFunc {
     type data struct {
         Region string
