diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html
index b03d869..7879a1d 100644
--- a/src/main/resources/templates/fragments.html
+++ b/src/main/resources/templates/fragments.html
@@ -39,8 +39,8 @@
   </nav>
 </div>
 <div th:fragment="searchBarRow">
-  <form action="/gallery" class="text-center row row-cols-auto align-items-center mt-2">
-    <div class="col-10">
+  <form action="/gallery" class="text-center row row-cols-auto justify-content-center align-items-center mt-2">
+    <div class="col-10 col-lg-6">
       <!--suppress HtmlFormInputWithoutLabel -->
       <input class="form-control" id="imageSearch"
              name="tags"
@@ -49,7 +49,7 @@
              th:value="${#request.getParameter('tags')}"
              type="search">
     </div>
-    <div class="col-2 d-grid">
+    <div class="col-2 col-lg-1 d-grid">
       <button class="btn btn-primary" type="submit">Search</button>
     </div>
   </form>
diff --git a/src/main/resources/templates/gallery.html b/src/main/resources/templates/gallery.html
index 28ace7e..89a8cf6 100644
--- a/src/main/resources/templates/gallery.html
+++ b/src/main/resources/templates/gallery.html
@@ -6,19 +6,19 @@
 </head>
 <body>
 <div th:replace="fragments :: navbar"></div>
-<div class="container">
+<div class="container-fluid">
     <div th:replace="fragments :: searchBarRow"></div>
     <div class="row mt-3" th:if="${imagePage != null}">
-        <div class="col-2">
+        <div class="col-md-1 col-2">
             <ul>
                 <li th:each="tag : ${commonTags}">
                     <a class="text-decoration-none"
                        th:href="${#mvc.url('IC#getGalleryPage').arg(0, 1).arg(1, tag.tag).build()}"
-                       th:text="${tag.tag} + ' ' + ${tag.amount}">tag</a>
+                       th:text="${tag.tag} + ' ' ">tag</a><span th:text="${tag.amount}"></span>
                 </li>
             </ul>
         </div>
-        <div class="col-10">
+        <div class="col-11">
             <div class="container-fluid">
                 <div class="row">
                     <div class="col-xl-2 col-lg-4 col-md-6 col-sm-12" th:each="image : ${imagePage.content}">
diff --git a/src/main/resources/templates/single.html b/src/main/resources/templates/single.html
index aa7c327..09b1ede 100644
--- a/src/main/resources/templates/single.html
+++ b/src/main/resources/templates/single.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <div th:replace="fragments :: navbar"></div>
-<div class="container">
+<div class="container-fluid">
     <div th:replace="fragments :: searchBarRow"></div>
     <div class="row mt-2">
         <div class="col-2">
@@ -14,8 +14,9 @@
                 <li th:each="tag : ${tags}">
                     <a class="text-decoration-none"
                        th:href="${#mvc.url('IC#getGalleryPage').arg(1, tag.tag).build()}"
-                       th:text="${tag.tag} + ' ' + ${tag.amount}">tag</a></li>
+                       th:text="${tag.tag} + ' '">tag</a><span th:text="${tag.amount}"></span></li>
             </ul>
+            <p>Uploaded by: <span th:text="${image.uploader.name}"></span></p>
             <form th:action="'/upload/d/' + ${image.id}"
                   th:if="${isUploader}"
                   th:method="delete">
