diff --git a/public_html/media/js/core.js b/public_html/media/js/core.js
index 2d7123c5..e1487223 100644
--- a/public_html/media/js/core.js
+++ b/public_html/media/js/core.js
@@ -83,8 +83,8 @@ $(function()
 			}
 		}
 
-		$('form[data-confirm-text]').submit(confirmEvent);
-		$('a[data-confirm-text]').click(confirmEvent);
+		$('form.confirmable').submit(confirmEvent);
+		$('a.confirmable').click(confirmEvent);
 
 
 		//simple action buttons
@@ -123,7 +123,7 @@ $(function()
 
 
 		//attach data from submit buttons to forms before .submit() gets called
-		$(':submit').each(function()
+		$('.submit').each(function()
 		{
 			$(this).click(function()
 			{
diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php
index 3c5e72cd..920181a2 100644
--- a/src/Controllers/PostController.php
+++ b/src/Controllers/PostController.php
@@ -511,7 +511,7 @@ class PostController
 			throw new SimpleException('Thumbnail file is not readable');
 
 		$this->context->layoutName = 'layout-file';
-		$this->context->transport->cacheDaysToLive = 30;
+		$this->context->transport->cacheDaysToLive = 365;
 		$this->context->transport->mimeType = 'image/jpeg';
 		$this->context->transport->fileHash = 'thumb' . md5($name . filemtime($path));
 		$this->context->transport->filePath = $path;
diff --git a/src/Views/auth-login.phtml b/src/Views/auth-login.phtml
index c48fc6c7..becf533b 100644
--- a/src/Views/auth-login.phtml
+++ b/src/Views/auth-login.phtml
@@ -16,7 +16,7 @@
 	<div>
 		<label class="left">&nbsp;</label>
 		<div class="input-wrapper">
-			<button type="submit">Log in</button>
+			<button class="submit" type="submit">Log in</button>
 			&nbsp;
 			<input type="hidden" name="remember" value="0"/>
 			<label>
diff --git a/src/Views/comment-small.phtml b/src/Views/comment-small.phtml
index 84f50a24..5573d1f8 100644
--- a/src/Views/comment-small.phtml
+++ b/src/Views/comment-small.phtml
@@ -27,7 +27,7 @@
 
 			<?php if (PrivilegesHelper::confirm(Privilege::DeleteComment, PrivilegesHelper::getIdentitySubPrivilege($this->context->comment->commenter))): ?>
 				<span class="delete">
-					<a class="simple-action" href="<?php echo \Chibi\UrlHelper::route('comment', 'delete', ['id' => $this->context->comment->id]) ?>" data-confirm-text="Are you sure you want to delete this comment?">
+					<a class="simple-action confirmable" href="<?php echo \Chibi\UrlHelper::route('comment', 'delete', ['id' => $this->context->comment->id]) ?>" data-confirm-text="Are you sure you want to delete this comment?">
 						delete
 					</a>
 				</span>
diff --git a/src/Views/post-edit.phtml b/src/Views/post-edit.phtml
index ac797ae3..b7cad27b 100644
--- a/src/Views/post-edit.phtml
+++ b/src/Views/post-edit.phtml
@@ -62,6 +62,6 @@
 
 	<div>
 		<label class="left">&nbsp;</label>
-		<button type="submit">Submit</button>
+		<button class="submit" type="submit">Submit</button>
 	</div>
 </form>
diff --git a/src/Views/post-upload.phtml b/src/Views/post-upload.phtml
index 84b5af9e..252e26d3 100644
--- a/src/Views/post-upload.phtml
+++ b/src/Views/post-upload.phtml
@@ -41,7 +41,7 @@
 				<div id="url-handler">
 					<div class="input-wrapper"><textarea placeholder="Paste some URLs here, one per line." name="urls"></textarea></div>
 				</div>
-				<button type="submit">Add</button>
+				<button class="submit" type="submit">Add</button>
 			</div>
 		</div>
 
@@ -55,7 +55,7 @@
 		</div>
 
 		<div class="submit-wrapper">
-			<button id="the-submit" type="submit">Submit</button>
+			<button id="the-submit" class="submit" type="submit">Submit</button>
 		</div>
 	</div>
 
diff --git a/src/Views/post-view.phtml b/src/Views/post-view.phtml
index 1681e1ca..98d09886 100644
--- a/src/Views/post-view.phtml
+++ b/src/Views/post-view.phtml
@@ -341,8 +341,8 @@
 			<input type="hidden" name="submit" value="1"/>
 
 			<div>
-				<button name="sender" type="submit" value="preview">Preview</button>&nbsp;
-				<button name="sender" type="submit" value="submit">Submit</button>
+				<button name="sender" class="submit" type="submit" value="preview">Preview</button>&nbsp;
+				<button name="sender" class="submit" type="submit" value="submit">Submit</button>
 			</div>
 		</form>
 	<?php endif ?>
diff --git a/src/Views/sidebar-options.phtml b/src/Views/sidebar-options.phtml
index c3b251c7..5e7fda7b 100644
--- a/src/Views/sidebar-options.phtml
+++ b/src/Views/sidebar-options.phtml
@@ -6,6 +6,8 @@
 			<?php foreach ($this->context->options as $option): ?>
 				<li class="<?php echo $option['class']; if (isset($option['inactive'])) echo ' inactive' ?>">
 					<?php
+						$class = [];
+
 						$attrs = [];
 						if (!empty($option['link']))
 						{
@@ -14,14 +16,22 @@
 						elseif (!empty($option['simple-action']))
 						{
 							$attrs['href'] = $option['simple-action'];
-							$attrs['class'] = 'simple-action';
+							$class []= 'simple-action';
+
+							if (isset($option['data-confirm-text']))
+							{
+								$attrs['data-confirm-text'] = $option['data-confirm-text'];
+								$class []= 'confirmable';
+							}
+
+							if (isset($option['data-redirect-url']))
+								$attrs['data-redirect-url'] = $option['data-redirect-url'];
 						}
 						else
 							$attrs['href'] = '#';
 
-						foreach ($option as $key => $val)
-							if (strpos($key, 'data-') === 0)
-								$attrs[$key] = $val;
+						if (!empty($class))
+							$attrs['class'] = join(' ', $class);
 
 						TextHelper::openHtmlTag('a', $attrs);
 						echo $option['text'];
diff --git a/src/Views/tag-mass-tag.phtml b/src/Views/tag-mass-tag.phtml
index 13955a49..182c5777 100644
--- a/src/Views/tag-mass-tag.phtml
+++ b/src/Views/tag-mass-tag.phtml
@@ -15,7 +15,7 @@
 
 		<div>
 			<label class="left">&nbsp;</label>
-			<button type="submit">Tag!</button>
+			<button class="submit" type="submit">Tag!</button>
 		</div>
 	</form>
 </div>
diff --git a/src/Views/tag-merge.phtml b/src/Views/tag-merge.phtml
index 31c4bde5..9418b753 100644
--- a/src/Views/tag-merge.phtml
+++ b/src/Views/tag-merge.phtml
@@ -15,7 +15,7 @@
 
 		<div>
 			<label class="left">&nbsp;</label>
-			<button type="submit">Merge!</button>
+			<button class="submit" type="submit">Merge!</button>
 		</div>
 	</form>
 </div>
diff --git a/src/Views/tag-rename.phtml b/src/Views/tag-rename.phtml
index 7ce2ae20..50a34857 100644
--- a/src/Views/tag-rename.phtml
+++ b/src/Views/tag-rename.phtml
@@ -15,7 +15,7 @@
 
 		<div>
 			<label class="left">&nbsp;</label>
-			<button type="submit">Rename!</button>
+			<button class="submit" type="submit">Rename!</button>
 		</div>
 	</form>
 </div>
diff --git a/src/Views/user-delete.phtml b/src/Views/user-delete.phtml
index 728057c5..7b1d1344 100644
--- a/src/Views/user-delete.phtml
+++ b/src/Views/user-delete.phtml
@@ -1,4 +1,4 @@
-<form action="<?php echo \Chibi\UrlHelper::route('user', 'delete', ['name' => $this->context->transport->user->name]) ?>" method="post" class="delete aligned" autocomplete="off" data-confirm-text="Are you sure you want to delete your account?">
+<form action="<?php echo \Chibi\UrlHelper::route('user', 'delete', ['name' => $this->context->transport->user->name]) ?>" method="post" class="delete aligned confirmable" autocomplete="off" data-confirm-text="Are you sure you want to delete your account?">
 	<?php if ($this->context->user->id == $this->context->transport->user->id): ?>
 		<div class="current-password">
 			<label class="left" for="current-password">Current password:</label>
@@ -12,6 +12,6 @@
 
 	<div>
 		<label class="left">&nbsp;</label>
-		<button type="submit">Delete account</button>
+		<button class="submit" type="submit">Delete account</button>
 	</div>
 </form>
diff --git a/src/Views/user-edit.phtml b/src/Views/user-edit.phtml
index d7471174..18ae2e32 100644
--- a/src/Views/user-edit.phtml
+++ b/src/Views/user-edit.phtml
@@ -56,6 +56,6 @@
 
 	<div>
 		<label class="left">&nbsp;</label>
-		<button type="submit">Submit</button>
+		<button class="submit" type="submit">Submit</button>
 	</div>
 </form>
diff --git a/src/Views/user-registration.phtml b/src/Views/user-registration.phtml
index 8425001f..87108cc6 100644
--- a/src/Views/user-registration.phtml
+++ b/src/Views/user-registration.phtml
@@ -38,7 +38,7 @@
 
 		<div>
 			<label class="left"></label>
-			<button type="submit">Register</button>
+			<button class="submit" type="submit">Register</button>
 		</div>
 	</form>
 <?php endif ?>
diff --git a/src/Views/user-select.phtml b/src/Views/user-select.phtml
index 6d8f3d2e..1e226df0 100644
--- a/src/Views/user-select.phtml
+++ b/src/Views/user-select.phtml
@@ -15,7 +15,7 @@
 
 		<div>
 			<label class="left">&nbsp;</label>
-			<button type="submit">Continue</button>
+			<button class="submit" type="submit">Continue</button>
 		</div>
 	</form>
 <?php endif ?>
diff --git a/src/Views/user-settings.phtml b/src/Views/user-settings.phtml
index 0fc12509..81be92d3 100644
--- a/src/Views/user-settings.phtml
+++ b/src/Views/user-settings.phtml
@@ -37,7 +37,7 @@
 
 	<div>
 		<label class="left">&nbsp;</label>
-		<button type="submit">Update settings</button>
+		<button class="submit" type="submit">Update settings</button>
 	</div>
 </form>