diff --git a/e107_plugins/online/online_shortcodes.php b/e107_plugins/online/online_shortcodes.php
index d6438a245..f75d59ef2 100644
--- a/e107_plugins/online/online_shortcodes.php
+++ b/e107_plugins/online/online_shortcodes.php
@@ -214,9 +214,9 @@ class online_shortcodes extends e_shortcode
 					{
 						continue;
 					}
-					$pinfo = $row['user_location'];
+					$pinfo = "forum/introductions/11/introducing-ourselves/&p=3"; // $row['user_location'];
 
-					$online_location_page = str_replace('.php', '', substr(strrchr($pinfo, '/'), 1));
+					$online_location_page = basename($pinfo); // /str_replace('.php', '', substr(strrchr($pinfo, '/'), 1));
 					if ($pinfo == 'log.php' || $pinfo == 'error.php')
 					{
 						$pinfo = 'news.php';
@@ -242,6 +242,11 @@ class online_shortcodes extends e_shortcode
 						$pinfo = 'comment.php';
 						$online_location_page = 'comment';
 					}
+
+
+
+
+
 					list($oid, $oname) = explode('.', $uinfo, 2);
 
 
diff --git a/e107_plugins/online/templates/online_menu_template.php b/e107_plugins/online/templates/online_menu_template.php
index cf6ea86b6..41992f338 100644
--- a/e107_plugins/online/templates/online_menu_template.php
+++ b/e107_plugins/online/templates/online_menu_template.php
@@ -11,109 +11,84 @@
 $ONLINE_MENU_TEMPLATE = array();
 
 // Last seen Menu
-$ONLINE_MENU_TEMPLATE['lastseen']['start']	= "<ul class='lastseen-menu '>";
-$ONLINE_MENU_TEMPLATE['lastseen']['item']	= "<li>{LASTSEEN_USERLINK} <small class='muted'>{LASTSEEN_DATE}</small></li>";
-$ONLINE_MENU_TEMPLATE['lastseen']['end']	= "</ul>";
+$ONLINE_MENU_TEMPLATE['lastseen']['start']	                        = "<ul class='lastseen-menu '>";
+$ONLINE_MENU_TEMPLATE['lastseen']['item']	                        = "<li>{LASTSEEN_USERLINK} <small class='muted'>{LASTSEEN_DATE}</small></li>";
+$ONLINE_MENU_TEMPLATE['lastseen']['end']	                        = "</ul>";
 
 
-$ONLINE_MENU_TEMPLATE['default']['enabled'] = "
-												<ul class='online-menu'>
-												{ONLINE_GUESTS}
-												{ONLINE_MEMBERS}
-												{ONLINE_MEMBERS_LIST_EXTENDED}
-												{ONLINE_ONPAGE}
-												{ONLINE_MEMBER_TOTAL}
-												{ONLINE_MEMBER_NEWEST}
-												<li>
-												{ONLINE_MOST}
-												<small class='muted'>
-												{ONLINE_MOST_GUESTS}
-												{ONLINE_MOST_MEMBERS}
-												{ONLINE_MOST_DATESTAMP}
-												</small>
-												</li>
-												</ul>
-												";
 
-$ONLINE_MENU_TEMPLATE['default']['disabled'] = "{ONLINE_TRACKING_DISABLED}";
 
-//##### ONLINE MEMBER LIST EXTENDED -------------------------------------------
-$ONLINE_MENU_TEMPLATE['default']['online_members_list_extended'] = "{SETIMAGE: w=40}<li class='media'><span class='media-object pull-left'>{ONLINE_MEMBER_IMAGE=avatar}</span><span class='media-body'>{ONLINE_MEMBER_USER} ".LAN_ONLINE_7." {ONLINE_MEMBER_PAGE}</span></li>";
+// Online Menu - default.
+
+$ONLINE_MENU_TEMPLATE['default']['enabled']                         = "
+																	<ul class='online-menu'>
+																	{ONLINE_GUESTS}
+																	{ONLINE_MEMBERS}
+																	{ONLINE_MEMBERS_LIST_EXTENDED}
+																	{ONLINE_ONPAGE}
+																	{ONLINE_MEMBER_TOTAL}
+																	{ONLINE_MEMBER_NEWEST}
+																	<li>
+																	{ONLINE_MOST}
+																	<small class='muted'>
+																	{ONLINE_MOST_GUESTS}
+																	{ONLINE_MOST_MEMBERS}
+																	{ONLINE_MOST_DATESTAMP}
+																	</small>
+																	</li>
+																	</ul>
+																	";
+
+$ONLINE_MENU_TEMPLATE['default']['disabled']                        = "{ONLINE_TRACKING_DISABLED}";
+$ONLINE_MENU_TEMPLATE['default']['online_members_list_extended']    = "{SETIMAGE: w=40}<li class='media'><span class='media-object pull-left'>{ONLINE_MEMBER_IMAGE=avatar}</span><span class='media-body'>{ONLINE_MEMBER_USER} ".LAN_ONLINE_7." {ONLINE_MEMBER_PAGE}</span></li>";
+
+
+
 
 $ONLINE_MENU_WRAPPER['default']['ONLINE_GUESTS']                   = "<li>".LAN_ONLINE_1."{---}</li>";
 $ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS']                  = "<li>".LAN_ONLINE_2."{---}</li>";
 $ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_LIST']             = "<ul>{---}</ul>";
 $ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_LIST_EXTENDED']    = "<ul class='unstyled list-unstyled'>{---}</ul>";
 $ONLINE_MENU_WRAPPER['default']['ONLINE_ONPAGE']                   = "<li>".LAN_ONLINE_3."{---}</li>";
-$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBER_TOTAL']             = "<li>".LAN_ONLINE_2."<span class='label label-default pull-right'>{---}</span></li>";
-$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBER_NEWEST']            = "<li>".LAN_ONLINE_6."</li><li><ul class='unstyled list-unstyled'>{---}</ul></li>";
+$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBER_TOTAL']             = "<li>".LAN_ONLINE_2."{---}</li>";
+$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBER_NEWEST']            = "<li>".LAN_ONLINE_6."{---}</li>";
 $ONLINE_MENU_WRAPPER['default']['ONLINE_MOST']                     = LAN_ONLINE_8."{---}<br />";
 $ONLINE_MENU_WRAPPER['default']['ONLINE_MOST_MEMBERS']             = LAN_ONLINE_2."{---}";
 $ONLINE_MENU_WRAPPER['default']['ONLINE_MOST_GUESTS']              = LAN_ONLINE_1."{---}";
-$ONLINE_MENU_WRAPPER['default']['ONLINE_MOST_DATESTAMP']           = "{---}";
+$ONLINE_MENU_WRAPPER['default']['ONLINE_MOST_DATESTAMP']           = LAN_ONLINE_9."{---}";
 $ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_REGISTERED']       = "<li>".LAN_ONLINE_11."{---}";
 
 
-$sc_style['ONLINE_GUESTS']['pre'] = "<li>".LAN_ONLINE_1;
-$sc_style['ONLINE_GUESTS']['post'] = "</li>";
+//##### ONLINE MEMBER LIST EXTENDED -------------------------------------------
 
-$sc_style['ONLINE_MEMBERS']['pre'] = "<li>".LAN_ONLINE_2;
-$sc_style['ONLINE_MEMBERS']['post'] = "</li>";
+$ONLINE_MENU_TEMPLATE['extended']['disabled']                       = "{ONLINE_TRACKING_DISABLED}";
+$ONLINE_MENU_TEMPLATE['extended']['enabled']                        = "
+																		<ul class='online-menu online-menu-extended list-unstyled'>
+																		{ONLINE_GUESTS}
+																		{ONLINE_MEMBERS}
+																		{ONLINE_MEMBERS_LIST_EXTENDED}
+																		{ONLINE_ONPAGE}
+																		{ONLINE_MEMBER_TOTAL}
+																		{ONLINE_MEMBER_NEWEST: type=avatar}
+																		{ONLINE_MEMBERS_REGISTERED}
+																		<li class='online-menu-extended-label'>
+																		{ONLINE_MOST}
+																		<div id='online-menu-extended-most' class='text-muted text-right' style='display:none'>
+																		<small>
+																		{ONLINE_MOST_GUESTS}<br />
+																		{ONLINE_MOST_MEMBERS}<br />
+																		{ONLINE_MOST_DATESTAMP=long}
+																		</small>
+																		</div>
+																		</li>
+																		</ul>
+																	";
 
-$sc_style['ONLINE_MEMBERS_LIST']['pre'] = "<ul>";
-$sc_style['ONLINE_MEMBERS_LIST']['post'] = "</ul>";
-
-$sc_style['ONLINE_MEMBERS_LIST_EXTENDED']['pre'] = "<ul class='unstyled list-unstyled'>";
-$sc_style['ONLINE_MEMBERS_LIST_EXTENDED']['post'] = "</ul>";
-
-$sc_style['ONLINE_ONPAGE']['pre'] = "<li>".LAN_ONLINE_3;
-$sc_style['ONLINE_ONPAGE']['post'] = "</li>";
-
-$sc_style['ONLINE_MEMBER_TOTAL']['pre'] = "<li>".LAN_ONLINE_2;
-$sc_style['ONLINE_MEMBER_TOTAL']['post'] = "</li>";
-
-$sc_style['ONLINE_MEMBER_NEWEST']['pre'] = "<li>".LAN_ONLINE_6;
-$sc_style['ONLINE_MEMBER_NEWEST']['post'] = "</li>";
-
-$sc_style['ONLINE_MOST']['pre'] = LAN_ONLINE_8;
-$sc_style['ONLINE_MOST']['post'] = "<br />";
-
-$sc_style['ONLINE_MOST_MEMBERS']['pre'] = LAN_ONLINE_2;
-$sc_style['ONLINE_MOST_MEMBERS']['post'] = "";
-
-$sc_style['ONLINE_MOST_GUESTS']['pre'] = "".LAN_ONLINE_1;
-$sc_style['ONLINE_MOST_GUESTS']['post'] = ", ";
-
-$sc_style['ONLINE_MOST_DATESTAMP']['pre'] = "".LAN_ONLINE_9;
-$sc_style['ONLINE_MOST_DATESTAMP']['post'] = "";
-
-$ONLINE_MENU_TEMPLATE['extended']['enabled'] = "
-												<ul class='online-menu online-menu-extended list-unstyled'>
-												{ONLINE_GUESTS}
-												{ONLINE_MEMBERS}
-												{ONLINE_MEMBERS_LIST_EXTENDED}
-												{ONLINE_ONPAGE}
-												{ONLINE_MEMBER_TOTAL}
-												{ONLINE_MEMBER_NEWEST: type=avatar}
-												{ONLINE_MEMBERS_REGISTERED}
-												<li class='online-menu-extended-label'>
-												{ONLINE_MOST}
-												<div id='online-menu-extended-most' class='text-muted text-right' style='display:none'>
-												<small>
-												{ONLINE_MOST_GUESTS}<br />
-												{ONLINE_MOST_MEMBERS}<br />
-												{ONLINE_MOST_DATESTAMP=long}
-												</small>
-												</div>
-												</li>
-												</ul>
-												";
-
-$ONLINE_MENU_TEMPLATE['extended']['online_members_list_extended']   = "{SETIMAGE: w=48&h=48&crop=1}<li class='media'><div class='media-left'>{ONLINE_MEMBER_IMAGE: type=avatar&shape=circle}</div><div class='media-body'><span class='online-menu-user'>{ONLINE_MEMBER_USER}</span><small class='text-muted'>".LAN_ONLINE_7." {ONLINE_MEMBER_PAGE}</small></div></li>";
+$ONLINE_MENU_TEMPLATE['extended']['online_members_list_extended']   = "{SETIMAGE: w=48&h=48&crop=1}<li class='media'><div class='media-left'>{ONLINE_MEMBER_IMAGE: type=avatar&shape=circle}</div><div class='media-body'><span class='online-menu-user'>{ONLINE_MEMBER_USER}</span><small class='text-muted'>{ONLINE_MEMBER_PAGE}</small></div></li>";
 $ONLINE_MENU_TEMPLATE['extended']['online_member_newest']           = "{SETIMAGE: w=48&h=48&crop=1}<li class='media'><div class='media-left'>{ONLINE_MEMBER_IMAGE: type=avatar&shape=circle}</div><div class='media-body'><span class='online-menu-user'>{ONLINE_MEMBER_USER}</span></div></li>";
 
 
-
+// Shortcode wrappers
 $ONLINE_MENU_WRAPPER['extended']['ONLINE_GUESTS']                   = "<li class='online-menu-extended-label'>".LAN_ONLINE_1."<span class='label label-primary pull-right'>{---}</span></li>";
 $ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS']                  = "<li class='online-menu-extended-label'>".LAN_ONLINE_2."<span class='label label-primary pull-right'>{---}</span></li>";
 $ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_LIST']             = "<ul>{---}</ul>";
@@ -126,4 +101,4 @@ $ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST_MEMBERS']             = LAN_ONLINE
 $ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST_GUESTS']              = LAN_ONLINE_1."{---}";
 $ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST_DATESTAMP']           = "{---}";
 $ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_REGISTERED']       = "<li class='online-menu-extended-label'>".LAN_ONLINE_11."<span class='label label-default pull-right'>{---}</li>";
-
+$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBER_PAGE']              = LAN_ONLINE_7." {---}";