diff --git a/frontend/src/routes/stock/Index.svelte b/frontend/src/routes/stock/Index.svelte
index 754f1bc9..3dcbd72d 100644
--- a/frontend/src/routes/stock/Index.svelte
+++ b/frontend/src/routes/stock/Index.svelte
@@ -241,7 +241,7 @@
 </script>
 
 <h2>{t('Stock')}</h2>
-<div class="grid3">
+<div class="stock grid3">
     <div class="locations">
         {#if top_level}
         {#each top_level as realm,idx}
@@ -278,11 +278,11 @@
     </div>
     {#if item && data && data.users}
     <div class="tags">
-        <span>{t('tags')}</span>
+        <h4>{t('tags')}</h4>
         <Tags module="stock" id={item.id} user_list={data.users} />
     </div>
     <div class="notes">
-        <span>{t('notes')}</span>
+        <h4>{t('notes')}</h4>
         <Notes module="stock" entity_id={item.id} />
     </div>
     {/if}
diff --git a/frontend/src/routes/tags/TagList.svelte b/frontend/src/routes/tags/TagList.svelte
index f9445c8d..a8183431 100644
--- a/frontend/src/routes/tags/TagList.svelte
+++ b/frontend/src/routes/tags/TagList.svelte
@@ -92,7 +92,7 @@
     async function onCommit(wrapped){
         if (!wrapped.display) {
             onEmptyCommit();
-        } else addTag(wrapped.display);
+        } else addTag(wrapped.display.trim());
     }
 
     function onSelect(dummy){}
diff --git a/frontend/src/routes/wiki/View.svelte b/frontend/src/routes/wiki/View.svelte
index 8423d8fb..337c985b 100644
--- a/frontend/src/routes/wiki/View.svelte
+++ b/frontend/src/routes/wiki/View.svelte
@@ -198,7 +198,10 @@
     {/if}
     {/if}
     <MarkdownEditor {editable} value={page.content} onSet={s => patch({content:s})} store_id="wiki/{page.id}/description" />
-    <TagList module="wiki" id={page.id} user_list={Object.keys(page.members).map(id => +id)} />
+    <div class="tags">
+        <h3>{t('tags')}</h3>
+        <TagList module="wiki" id={page.id} user_list={Object.keys(page.members).map(id => +id)} />
+    </div>
     <div class="notes">
         <h3>{t('notes')}</h3>
         <Notes module="wiki" entity_id={page.id} />
diff --git a/tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java b/tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java
index 5503a997..7e6218f4 100644
--- a/tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java
+++ b/tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java
@@ -144,7 +144,7 @@ public class TagModule extends BaseHandler implements TagService {
 
 	@Override
 	public void save(String module, long entityId, Collection<Long> userIds, Collection<String> tags) {
-		tagDb.save(userIds,module,entityId,tags);
+		tagDb.save(userIds,module,entityId,tags.stream().map(String::trim).toList());
 	}
 
 	@Override
diff --git a/web/src/main/resources/web/css/default.css b/web/src/main/resources/web/css/default.css
index cded98da..40d2dfc1 100644
--- a/web/src/main/resources/web/css/default.css
+++ b/web/src/main/resources/web/css/default.css
@@ -539,6 +539,10 @@ a.wikilink{
     grid-template-columns: [left] 1fr [first] 1fr [second] 1fr [right]
 }
 
+.stock.grid3{
+	grid-template-columns: [left] 1fr [first] 1fr [second] 2fr [right]
+}
+
 .grid3 .locations {
     grid-row-end: span 3;
 }