diff --git a/templates/components/themes/common/download.latte b/templates/components/themes/common/download.latte
index 6b97bd2..76a30a0 100644
--- a/templates/components/themes/common/download.latte
+++ b/templates/components/themes/common/download.latte
@@ -1,22 +1,8 @@
-{embed '../../form.latte', path: '/redirect/download', method: 'GET'}
-	{block fields}
-		<div class="field has-addons has-addons-centered">
-			<div class="control">
-				<div class="select">
-					<select name="watermark">
-						<option value="yes">WM</option>
-						<option value="no">No WM</option>
-					</select>
-				</div>
-			</div>
-			<div class="control">
-				<button type="submit" class="button is-success">
-					{include '../../icon.latte', icon: 'software-download', text: 'Download'}
-				</a>
-			</div>
-		</div>
-		<input type="hidden" name="playAddr" value="{$playAddr}" />
-		<input type="hidden" name="videoId" value="{$id}" />
-		<input type="hidden" name="authorUsername" value="{$uniqueId}" />
-	{/block}
-{/embed}
+<div class="field is-grouped is-grouped-centered">
+  <p class="control">
+		<a target="_blank" href="{url_download($playAddr, $uniqueId, $id, true)}" class="button is-info">Watermark</a>
+  </p>
+  <p class="control">
+		<a target="_blank" href="{url_download(url_video_external($uniqueId, $id), $uniqueId, $id, false)}" class="button">No watermark</a>
+  </p>
+</div>
diff --git a/templates/components/themes/common/share.latte b/templates/components/themes/common/share.latte
index 9035e3b..f471b60 100644
--- a/templates/components/themes/common/share.latte
+++ b/templates/components/themes/common/share.latte
@@ -1,14 +1,12 @@
-<nav class="breadcrumb is-centered" aria-label="breadcrumbs">
-  <ul>
-    <li>
-			<a class="has-text-success" href="{url_video_internal($uniqueId, $id)}">
-				{include '../../icon.latte', icon: 'lock', text: 'Instance link'}
-			</a>
-		</li>
-    <li>
-			<a class="has-text-warning" href="{url_video_external($uniqueId, $id)}">
-				{include '../../icon.latte', icon: 'lock-unlock', text: 'Original Link'}
-			</a>
-		</li>
-  </ul>
-</nav>
+<div class="field is-grouped is-grouped-centered">
+  <p class="control">
+		<a class="button is-success" href="{url_video_internal($uniqueId, $id)}">
+			{include '../../icon.latte', icon: 'lock', text: 'Instance'}
+		</a>
+  </p>
+  <p class="control">
+		<a class="button is-warning" href="{url_video_external($uniqueId, $id)}">
+			{include '../../icon.latte', icon: 'lock-unlock', text: 'Original'}
+		</a>
+  </p>
+</div>
diff --git a/templates/components/themes/default.latte b/templates/components/themes/default.latte
index 7fa8bed..a9b0a1b 100644
--- a/templates/components/themes/default.latte
+++ b/templates/components/themes/default.latte
@@ -24,10 +24,10 @@
 					<source src="{url_stream($item->video->playAddr)}" type="video/mp4" />
 				</video>
 			</div>
-			<div class="has-text-centered">
-				{include './common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $item->author->uniqueId}
-				<div class="mt-2">{include './common/share.latte', uniqueId: $item->author->uniqueId, id: $item->id}</div>
-			</div>
+			<p class="has-text-centered"><b>Download video</b></p>
+			{include './common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $item->author->uniqueId}
+			<p class="has-text-centered"><b>Share link</b></p>
+			{include './common/share.latte', uniqueId: $item->author->uniqueId, id: $item->id}
   	</div>
 	</article>
 	{/foreach}