diff --git a/discord_rss_bot/templates/add.html b/discord_rss_bot/templates/add.html
index 1531fc9..d01665c 100644
--- a/discord_rss_bot/templates/add.html
+++ b/discord_rss_bot/templates/add.html
@@ -28,7 +28,7 @@
                         </option>
                         {% for hook in webhooks %}
                             <option value="{{ hook.name }}">
-                                {{ hook.name }}
+                                {{- hook.name -}}
                             </option>
                         {% endfor %}
                     </select>
diff --git a/discord_rss_bot/templates/blacklist.html b/discord_rss_bot/templates/blacklist.html
index 349fc44..4e4893e 100644
--- a/discord_rss_bot/templates/blacklist.html
+++ b/discord_rss_bot/templates/blacklist.html
@@ -36,7 +36,7 @@
                            class="form-control bg-dark border-dark text-muted"
                            id="blacklist_title"
                            value="{% if blacklist_title %}
-                                      {{ blacklist_title }}
+                                      {{- blacklist_title -}}
                                   {% endif %}"/>
                     <label for="blacklist_summary" class="col-sm-6 col-form-label">Blacklist - Summary</label>
                     <input name="blacklist_summary"
@@ -44,7 +44,7 @@
                            class="form-control bg-dark border-dark text-muted"
                            id="blacklist_summary"
                            value="{% if blacklist_summary %}
-                                      {{ blacklist_summary }}
+                                      {{- blacklist_summary -}}
                                   {% endif %}"/>
                     <label for="blacklist_content" class="col-sm-6 col-form-label">Blacklist - Content (Not implemented yet)</label>
                     <input name="blacklist_content"
@@ -52,7 +52,7 @@
                            class="form-control bg-dark border-dark text-muted"
                            id="blacklist_content"
                            value="{% if blacklist_content %}
-                                      {{ blacklist_content }}
+                                      {{- blacklist_content -}}
                                   {% endif %}"
                            disabled/>
                 </div>
diff --git a/discord_rss_bot/templates/custom.html b/discord_rss_bot/templates/custom.html
index 91926b0..f5c7517 100644
--- a/discord_rss_bot/templates/custom.html
+++ b/discord_rss_bot/templates/custom.html
@@ -210,7 +210,7 @@
                                 <li>
                                     <code>
                                         {% raw %}
-                                            Hello {{ entry_author }}\n{{ feed_title }}\n{{ entry_read -}}
+                                            Hello {{ entry_author }}\n{{ feed_title }}\n{{ entry_read }}
                                         {% endraw %}
                                     </code>
                                 </li>
@@ -221,7 +221,7 @@
                                         <pre>
 Hello {{ entry.author }}
 {{ feed.title }}
-{{ entry.read -}}
+{{ entry.read }}
                             </pre>
                                     </code>
                                 </li>
@@ -235,8 +235,9 @@ Hello {{ entry.author }}
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="custom_message"
-                           value="{% if custom_message -%}
-                                      {{ custom_message }}{%- endif %}"/>
+                           value="{% if custom_message %}
+                                      {{- custom_message -}}
+                                  {% endif %}"/>
                 </div>
             </div>
             <!-- Add a hidden feed_url field to the form -->
diff --git a/discord_rss_bot/templates/index.html b/discord_rss_bot/templates/index.html
index a746d9a..25faccb 100644
--- a/discord_rss_bot/templates/index.html
+++ b/discord_rss_bot/templates/index.html
@@ -22,7 +22,7 @@
             {% else %}
                 - <span>
             {% endif %}
-        {{ feed_count.updates_enabled }} enabled</span>
+        {{- feed_count.updates_enabled -}} enabled</span>
         <!-- How many entries -->
         - {{ entry_count.total }} entries
         <abbr title="Average entries per day for the past 1, 3 and 12 months">
diff --git a/discord_rss_bot/templates/search.html b/discord_rss_bot/templates/search.html
index 0694a55..cc04cae 100644
--- a/discord_rss_bot/templates/search.html
+++ b/discord_rss_bot/templates/search.html
@@ -4,7 +4,7 @@
 {% endblock title %}
 {% block content %}
     <div class="p-2 border border-dark text-muted">
-        Your search for "{{ query }}" returned {{ search_amount.total }} results.
+        Your search for "{{- query -}}" returned {{- search_amount.total -}} results.
     </div>
-    {{ search_html | safe }}
+    {{- search_html | safe -}}
 {% endblock content %}
diff --git a/discord_rss_bot/templates/webhooks.html b/discord_rss_bot/templates/webhooks.html
index 479e40a..f4f2514 100644
--- a/discord_rss_bot/templates/webhooks.html
+++ b/discord_rss_bot/templates/webhooks.html
@@ -24,7 +24,7 @@
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="webhook_url"
-                           placeholder="https://discord.com/api/webhooks/1011224189471124054/CQMa4hJN4gz..."/>
+                           placeholder="https://discord.com/api/webhooks/1011224189471124054/CQMa4hJN4gz"/>
                 </div>
             </div>
             {# Submit button #}
diff --git a/discord_rss_bot/templates/whitelist.html b/discord_rss_bot/templates/whitelist.html
index f102ee9..7cf52eb 100644
--- a/discord_rss_bot/templates/whitelist.html
+++ b/discord_rss_bot/templates/whitelist.html
@@ -35,19 +35,25 @@
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="whitelist_title"
-                           value="{% if whitelist_title %} {{ whitelist_title }}{% endif %}"/>
+                           value="{% if whitelist_title %}
+                                      {{- whitelist_title -}}
+                                  {% endif %}"/>
                     <label for="whitelist_summary" class="col-sm-6 col-form-label">Whitelist - Summary</label>
                     <input name="whitelist_summary"
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="whitelist_summary"
-                           value="{% if whitelist_summary %} {{ whitelist_summary }}{% endif %}"/>
+                           value="{% if whitelist_summary %}
+                                      {{- whitelist_summary -}}
+                                  {% endif %}"/>
                     <label for="whitelist_content" class="col-sm-6 col-form-label">Whitelist - Content (Not implemented yet)</label>
                     <input name="whitelist_content"
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="whitelist_content"
-                           value="{% if whitelist_content %} {{ whitelist_content }}{% endif %}"
+                           value="{% if whitelist_content %}
+                                      {{- whitelist_content -}}
+                                  {% endif %}"
                            disabled/>
                 </div>
             </div>