diff --git a/internal/routes/misc.go b/internal/routes/misc.go
index 6e2ac52..918885b 100644
--- a/internal/routes/misc.go
+++ b/internal/routes/misc.go
@@ -69,7 +69,7 @@ func (ctrl *MiscController) Index(w http.ResponseWriter, r *auth.AuthenticatedRe
 	// Note the call to ParseFS instead of Parse
 	t, err := template.ParseFS(TemplatesFS, "templates/index.html.tmpl")
 	if err != nil {
-		log.Fatal(err)
+		logrus.Fatalln(err)
 	}
 
 	// Header
@@ -116,7 +116,7 @@ func (ctrl *MiscController) getConfiguration(w http.ResponseWriter, r *auth.Auth
 	// Note the call to ParseFS instead of Parse
 	t, err := template.ParseFS(TemplatesFS, "templates/configuration.html.tmpl")
 	if err != nil {
-		log.Fatal(err)
+		logrus.Fatalln(err)
 	}
 
 	// Header
diff --git a/templates/configuration.html.tmpl b/templates/configuration.html.tmpl
index 29d7320..182fe2d 100644
--- a/templates/configuration.html.tmpl
+++ b/templates/configuration.html.tmpl
@@ -130,8 +130,8 @@
 
                 </fieldset>
 
-                <p class="text-center">
-                    <input type="submit" class="btn btn-success" value="Save the settings">
+                <p class="text-center mt-2">
+                    <input type="submit" class="btn btn-success mt-2" value="Save the settings">
                 </p>
             </form>
         </div>
diff --git a/templates/index.html.tmpl b/templates/index.html.tmpl
index 71122d5..8249dba 100644
--- a/templates/index.html.tmpl
+++ b/templates/index.html.tmpl
@@ -111,12 +111,12 @@
             </div>
 
             {{ range $key, $value := .Cameras }}
-            <div class="col-12 mb-4 col-md-6 col-lg-6">
+            <div class="col-12 col-md-6 col-lg-6">
                 <div class="card bg-light">
-                    <h5 class="card-header">Camera <i class="fa fa-camera pull-right" aria-hidden="true"></i></h5>
+                    <h5 class="card-header">Camera <small class="text-capitalize">({{ $key }})</small></h5>
                     <div class="card-body">
-                    <p class="card-text"><img class="img-fluid" [src]="camera.value" /></p>
-                    <p class="text-center"><a target="_blank" href="{{ .camera.value }}"><button class="btn btn-info"><i class="fa fa-search-plus" aria-hidden="true"></i> Larger view</button></a></p>
+                    <p class="card-text"><img class="img-fluid" src="{{ $value }}" /></p>
+                    <p class="text-center"><a target="_blank" href="{{ $value }}"><button class="btn btn-info"><i class="fa fa-search-plus" aria-hidden="true"></i> Larger view</button></a></p>
                     </div>
                 </div>
             </div>