diff --git a/internal/templates/add.html b/internal/templates/add.html
index 548fe72..d2cd6a2 100644
--- a/internal/templates/add.html
+++ b/internal/templates/add.html
@@ -1,38 +1,38 @@
 {{define "content"}}
-  <article class="grid">
-    <div>
-      <hgroup>
-        <h2>Add site</h2>
-        <h3>Add a new site to be indexed</h3>
-      </hgroup>
-      <form action="/add" method="POST">
-        <input type="hidden" name="csrf_token" value="{{ $.CSRFToken }}">
-        <input type="url" name="url" placeholder="Website's URL" aria-label="URL" autocomplete="url" required>
-        <button type="submit" class="primary">
-          <i class="icss-plus"></i>
-          Add
-        </button>
-      </form>
-    </div>
-    <div>
-      <hgroup>
-        <h2>How to add new sites</h2>
-      </hgroup>
-      <p>
-        Spyda relies on users to contribute and add websites or URLs to be
-        considered for crawling and indexing. Without this there is no way
-        to increase the number of website indexed and crawled by Spyda.
-      </p>
-      <p>
-        To add a website to Spyda's crawler for consideration, just enter the
-        website's address or URl in the box and click "Add". Spyda will then
-        start to crawl the website, index it and it will become available for
-        future search queries.
-      </p>
-      <p>
-        If you are the author or maintainer of a website that you wish <b>NOT</b>
-        to be indexed by Spyda, please contact <a href="/support">support</a>.
-      </p>
-    </div>
-  </article>
+<article class="grid">
+  <div>
+    <hgroup>
+      <h2>Add site</h2>
+      <h3>Add a new site to be indexed</h3>
+    </hgroup>
+    <form action="/add" method="POST">
+      <input type="hidden" name="csrf_token" value="{{ $.CSRFToken }}">
+      <input type="url" name="url" placeholder="Website's URL" aria-label="URL" autocomplete="url" autofocus required>
+      <button type="submit" class="primary">
+        <i class="icss-plus"></i>
+        Add
+      </button>
+    </form>
+  </div>
+  <div>
+    <hgroup>
+      <h2>How to add new sites</h2>
+    </hgroup>
+    <p>
+      Spyda relies on users to contribute and add websites or URLs to be
+      considered for crawling and indexing. Without this there is no way
+      to increase the number of website indexed and crawled by Spyda.
+    </p>
+    <p>
+      To add a website to Spyda's crawler for consideration, just enter the
+      website's address or URl in the box and click "Add". Spyda will then
+      start to crawl the website, index it and it will become available for
+      future search queries.
+    </p>
+    <p>
+      If you are the author or maintainer of a website that you wish <b>NOT</b>
+      to be indexed by Spyda, please contact <a href="/support">support</a>.
+    </p>
+  </div>
+</article>
 {{end}}
diff --git a/internal/templates/index.html b/internal/templates/index.html
index 5217d35..e4ea657 100644
--- a/internal/templates/index.html
+++ b/internal/templates/index.html
@@ -1,11 +1,11 @@
 {{define "content"}}
-  <div class="container">
-    <form action="/search" method="GET">
-      <input type="text" id="search" name="q" placeholder="{{ $.SearchPrompt }}" value="{{ $.SearchQuery }}">
-      <button id="go" type="submit">
-        <i class="icss-search"></i>
-        Go!
-      </button>
-    </form>
-  </div>
+<div class="container">
+  <form action="/search" method="GET">
+    <input type="text" id="search" name="q" placeholder="{{ $.SearchPrompt }}" value="{{ $.SearchQuery }}" autofocus required>
+    <button id="go" type="submit">
+      <i class="icss-search"></i>
+      Go!
+    </button>
+  </form>
+</div>
 {{end}}
diff --git a/internal/templates/search.html b/internal/templates/search.html
index 35b8455..1d3277f 100644
--- a/internal/templates/search.html
+++ b/internal/templates/search.html
@@ -1,23 +1,25 @@
 {{define "content"}}
-  <div class="container">
-    <form action="/search" method="GET">
-      <input type="text" id="search" name="q" placeholder="{{ $.SearchPrompt }}" value="{{ $.SearchQuery }}">
-      <button id="go" type="submit">
-        <i class="icss-search"></i>
-        Go!
-      </button>
-    </form>
-  </div>
-  <article class="container">
-    {{ with $.Results }}
-      <ol>
-        {{ range . }}
-          <li><a href="{{ .URL }}">{{ .Title }}</a><p{{ if .Summary }}>{{ .Summary }}{{ else }} class="placeholder">No summary available{{ end }}</p><p class="small"><a href="{{ .URL }}">{{ .URL }}</a> {{ .Length }} <a href="/cache?id={{ .ID }}">View cached</a></p>
+<div class="container">
+  <form action="/search" method="GET">
+    <input type="text" id="search" name="q" placeholder="{{ $.SearchPrompt }}" value="{{ $.SearchQuery }}" autofocus required>
+    <button id="go" type="submit">
+      <i class="icss-search"></i>
+      Go!
+    </button>
+  </form>
+</div>
+<article class="container">
+  {{ with $.Results }}
+  <ol>
+    {{ range . }}
+    <li><a href="{{ .URL }}">{{ .Title }}</a>
+      <p{{ if .Summary }}>{{ .Summary }}{{ else }} class="placeholder">No summary available{{ end }}</p>
+        <p class="small"><a href="{{ .URL }}">{{ .URL }}</a> {{ .Length }} <a href="/cache?id={{ .ID }}">View cached</a></p>
         {{ end }}
-      </ol>
-      <p>If your page appears here and you do not want it to, please contact <a href="/support">Support</a>.</p>
-    {{ else }}
-      <p>No search results</p>
-    {{ end }}
-  </article>
+  </ol>
+  <p>If your page appears here and you do not want it to, please contact <a href="/support">Support</a>.</p>
+  {{ else }}
+  <p>No search results</p>
+  {{ end }}
+</article>
 {{end}}