diff --git a/lib/template.go b/lib/template.go
index bdd83af..448a3c6 100644
--- a/lib/template.go
+++ b/lib/template.go
@@ -90,8 +90,8 @@ func InitTemplate(assetsPath string) *Template {
 	return &t
 }
 
-func stringsJoin(strs []string) string {
-	return strings.Join(strs, ", ")
+func stringsJoin(strs []string, sep string) string {
+	return strings.Join(strs, sep)
 }
 
 func bookFileName(book database.Book) string {
diff --git a/templates/book.html b/templates/book.html
index 05d9fc4..f2d47c3 100644
--- a/templates/book.html
+++ b/templates/book.html
@@ -47,7 +47,12 @@ function closeAlert() {
         <dl class="row">
           {{if .Authors}}
             <dt class="col-sm-3 text-sm-end">Authors</dt>
-        	<dd class="col-sm-9 text-start">{{range .Authors}}<a href="/search/?q=author:{{.}}">{{.}}</a>, {{end}}</dd>
+        	<dd class="col-sm-9 text-start">
+				{{range $i, $author := .Authors}}
+				  {{if $i}}&amp;{{end}}
+				  <a href="/search/?q=author:{{$author}}">{{$author}}</a>
+				{{end}}
+			</dd>
           {{end}}
           {{if .Publisher}}
             <dt class="col-sm-3 text-sm-end">Publisher</dt>
@@ -55,7 +60,12 @@ function closeAlert() {
           {{end}}
           {{if .Tags}}
             <dt class="col-sm-3 text-sm-end">Tags</dt>
-        	<dd class="col-sm-9 text-start">{{range .Tags}}<a href="/search/?q=tag:{{.}}">{{.}}</a>, {{end}}</dd>
+        	<dd class="col-sm-9 text-start">
+			  {{range $i, $tag := .Tags}}
+			    {{if $i}},{{end}}
+			    <a href="/search/?q=tag:{{$tag}}">{{$tag}}</a>
+			  {{end}}
+			</dd>
           {{end}}
           {{if .Isbn}}
             <dt class="col-sm-3 text-sm-end">ISBN</dt>
diff --git a/templates/book_list.html b/templates/book_list.html
index dfee381..5f464f7 100644
--- a/templates/book_list.html
+++ b/templates/book_list.html
@@ -14,7 +14,12 @@
 		  <span class="text-muted">{{if .Publisher}}{{.Publisher}}{{end}}</span>
 		</p>
 		<div class="card-text row">
-		  <p class="col-9">{{range .Authors}}{{.}}, {{end}}</p>
+		  <p class="col-9">
+			{{range $i, $author := .Authors}}
+			  {{if $i}}<span class="text-muted">&amp;</span>{{end}}
+			  {{$author}}</a>
+			{{end}}
+		  </p>
 		  <div class="col-3">
 			<div class="btn-group d-flex justify-content-end">
 			  <a href="{{download_url .}}" class="btn btn-dark btn-sm">
diff --git a/templates/edit.html b/templates/edit.html
index fb8a27e..1c97245 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -57,7 +57,7 @@
           <label class="col-form-label" for="tags">Tags</label>
         </div>
       	<div class="col-sm-10">
-      	<input class="form-control" type="text" id="tags" value="{{range .Tags}}{{.}},{{end}}" name="tags" placeholder="Add tag and hit enter">
+      	<input class="form-control" type="text" id="tags" value="{{strings_join .Tags ","}}" name="tags" placeholder="Add tag and hit enter">
       	</div>
       </div>
       <br />
diff --git a/templates/list_edit.html b/templates/list_edit.html
index aae3832..b5c780a 100644
--- a/templates/list_edit.html
+++ b/templates/list_edit.html
@@ -36,7 +36,7 @@
 		  <span class="text-muted">{{if .Publisher}}{{.Publisher}}{{end}}</span>
 		</p>
 		<div class="card-text row">
-		  <p class="col-9">{{range .Authors}}{{.}}, {{end}}</p>
+		  <p class="col-9">{{strings_join .Authors "& "}}</p>
 		  <div class="col-3">
 			<div class="btn-group d-flex justify-content-end">
 	          <a href="/list/{{$listID}}/remove/{{.ID}}" class="btn btn-danger">
diff --git a/templates/submission.html b/templates/submission.html
index cc2b4d2..b872618 100644
--- a/templates/submission.html
+++ b/templates/submission.html
@@ -44,9 +44,20 @@
 			</p>
 			<div class="card-text row">
 			  <p class="col-md-8">
-	            {{if .Authors}}<strong>Authors:</strong> {{range .Authors}}<a href="/search/?q=author:{{.}}">{{.}}</a>, {{end}}<br />{{end}}
+	            {{if .Authors}}<strong>Authors:</strong>
+
+				  {{range $i, $author := .Authors}}
+				    {{if $i}}&amp;{{end}}
+				    <a href="/search/?q=author:{{$author}}">{{$author}}</a>
+				  {{end}}
+				<br />{{end}}
 	            {{if .Publisher}}<strong>Publisher:</strong> <a href="/search/?q=publisher:{{.Publisher}}">{{.Publisher}}</a><br />{{end}}
-	            {{if .Tags}}<strong>Tags:</strong> {{range .Tags}}<a href="/search/?q=tag:{{.}}">{{.}}</a>, {{end}}<br />{{end}}
+	            {{if .Tags}}<strong>Tags:</strong>
+			      {{range $i, $tag := .Tags}}
+			        {{if $i}},{{end}}
+			        <a href="/search/?q=tag:{{$tag}}">{{$tag}}</a>
+			      {{end}}
+				<br />{{end}}
 	            {{if .Isbn}}<strong>ISBN:</strong> {{.Isbn}}<br />{{end}}
 	            {{if .Date}}<strong>Date:</strong> {{.Date}}<br />{{end}}
 	            {{if .Lang}}<strong>Lang:</strong> <a href="/search/?q=lang:{{.Lang}}">{{.Lang}}</a> <br />{{end}}
diff --git a/templates/submission_moderate.html b/templates/submission_moderate.html
index 7095787..b6c1782 100644
--- a/templates/submission_moderate.html
+++ b/templates/submission_moderate.html
@@ -57,9 +57,20 @@
 			</p>
 			<div class="card-text row">
 			  <p class="col-md-8">
-			    {{if .Authors}}<strong>Authors:</strong> {{range .Authors}}<a href="/search/?q=author:{{.}}">{{.}}</a>, {{end}} <!--<small>({{$authorFound}})</small>--><br />{{end}}
+	            {{if .Authors}}<strong>Authors:</strong>
+
+				  {{range $i, $author := .Authors}}
+				    {{if $i}}&amp;{{end}}
+				    <a href="/search/?q=author:{{$author}}">{{$author}}</a>
+				  {{end}}
+				<!--<small>({{$authorFound}})</small>--><br />{{end}}
 	            {{if .Publisher}}<strong>Publisher:</strong> <a href="/search/?q=publisher:{{.Publisher}}">{{.Publisher}}</a><br />{{end}}
-	            {{if .Tags}}<strong>Tags:</strong> {{range .Tags}}<a href="/search/?q=tag:{{.}}">{{.}}</a>, {{end}}<br />{{end}}
+	            {{if .Tags}}<strong>Tags:</strong>
+			      {{range $i, $tag := .Tags}}
+			        {{if $i}},{{end}}
+			        <a href="/search/?q=tag:{{$tag}}">{{$tag}}</a>
+			      {{end}}
+				<br />{{end}}
 	            {{if .Isbn}}<strong>ISBN:</strong> {{.Isbn}}<br />{{end}}
 	            {{if .Date}}<strong>Date:</strong> {{.Date}}<br />{{end}}
 	            {{if .Lang}}<strong>Lang:</strong> <a href="/search/?q=lang:{{.Lang}}">{{.Lang}}</a> <br />{{end}}
diff --git a/templates/submissions.html b/templates/submissions.html
index 94352c1..b59aab8 100644
--- a/templates/submissions.html
+++ b/templates/submissions.html
@@ -38,9 +38,20 @@
 			</p>
 			<div class="card-text row">
 			  <p class="col-md-8">
-	            {{if .Authors}}<strong>Authors:</strong> {{range .Authors}}<a href="/search/?q=author:{{.}}">{{.}}</a>, {{end}}<br />{{end}}
+	            {{if .Authors}}<strong>Authors:</strong>
+
+				  {{range $i, $author := .Authors}}
+				    {{if $i}}&amp;{{end}}
+				    <a href="/search/?q=author:{{$author}}">{{$author}}</a>
+				  {{end}}
+				<br />{{end}}
 	            {{if .Publisher}}<strong>Publisher:</strong> <a href="/search/?q=publisher:{{.Publisher}}">{{.Publisher}}</a><br />{{end}}
-	            {{if .Tags}}<strong>Tags:</strong> {{range .Tags}}<a href="/search/?q=tag:{{.}}">{{.}}</a>, {{end}}<br />{{end}}
+	            {{if .Tags}}<strong>Tags:</strong>
+			      {{range $i, $tag := .Tags}}
+			        {{if $i}},{{end}}
+			        <a href="/search/?q=tag:{{$tag}}">{{$tag}}</a>
+			      {{end}}
+				<br />{{end}}
 	            {{if .Isbn}}<strong>ISBN:</strong> {{.Isbn}}<br />{{end}}
 	            {{if .Date}}<strong>Date:</strong> {{.Date}}<br />{{end}}
 	            {{if .Lang}}<strong>Lang:</strong> <a href="/search/?q=lang:{{.Lang}}">{{.Lang}}</a> <br />{{end}}