diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index 9c0a8b9e4..c769defa0 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -778,7 +778,7 @@ function newthreadjump($url)
     <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
     <span class="caret"></span>
     </button>
-    <ul class="dropdown-menu">
+    <ul class="dropdown-menu pull-right">
     ';
 	
 	foreach($jumpList as $key => $val)
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index 80bf7aef9..bfbb2b1b6 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -286,7 +286,7 @@ function forumbuttons($thread)
     <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
     <span class="caret"></span>
     </button>
-    <ul class="dropdown-menu">
+    <ul class="dropdown-menu pull-right">
     ';
 	
 	foreach($options as $key => $val)
@@ -344,8 +344,6 @@ foreach ($postList as $postInfo)
 	$e_hide_hidden = FORLAN_HIDDEN;
 	$e_hide_allowed = USER;
 	
-	
-
 	if ($tnum > 1)
 	{
 		$postInfo['thread_start'] = false;
diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index a9a0e5a28..7764ec722 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -51,7 +51,15 @@ class plugin_forum_view_shortcodes extends e_shortcode
 		return $this->postInfo['post_id'];
 	}
 
+	/* Preferred - as {POST} may conflict with other shortcodes */
+	function sc_thread_text()
+	{
+		return $this->sc_post();	
+	}
 
+	/**
+	 * @DEPRECATED - use {THREAD_TEXT}
+	 */
 	function sc_post()
 	{
 		$emote = (isset($this->postInfo['post_options']['no_emote']) ? ',emotes_off' : '');
@@ -467,7 +475,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
     	Options
     	<span class="caret"></span>
     	</button>
-    	<ul class="dropdown-menu left">';
+    	<ul class="dropdown-menu pull-right">';
 			
     	
 		$text .= "<li><a href='".e_HTTP."email.php?plugin:forum.".$this->postInfo['post_thread']."'>".FORLAN_101."</a></li>";
diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php
index c97b64976..b0d5751cf 100644
--- a/e107_plugins/forum/templates/forum_viewtopic_template.php
+++ b/e107_plugins/forum/templates/forum_viewtopic_template.php
@@ -343,7 +343,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
 											</div>
 											<div class='span9 '>
 												{POLL}
-												{POST}
+												{THREAD_TEXT}
 												{ATTACHMENTS}
 											</div>
 										</div>