diff --git a/e107_plugins/calendar_menu/admin_config.php b/e107_plugins/calendar_menu/admin_config.php
index c74acbf23..f5caca5c1 100644
--- a/e107_plugins/calendar_menu/admin_config.php
+++ b/e107_plugins/calendar_menu/admin_config.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/admin_config.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2007-09-04 21:09:46 $
+|     $Revision: 1.4 $
+|     $Date: 2007-12-15 21:46:20 $
 |     $Author: e107steved $
 |
 +----------------------------------------------------------------------------+
@@ -852,7 +852,10 @@ $text .= "
 
 	<tr>
 		<td class='forumheader3'>".EC_LAN_102."</td>
-		<td class='forumheader3'><input class='tbox' type='checkbox' name='eventpost_forum' value='1' ".($pref['eventpost_forum']==1?" checked='checked' ":"")." /></td>
+		<td class='forumheader3'>
+		  <input class='tbox' type='checkbox' name='eventpost_forum' value='1' ".($pref['eventpost_forum']==1?" checked='checked' ":"")." />
+		  		<span class='smalltext'><em>".EC_ADLAN_A22."</em></span>
+		  </td>
 	</tr>
 
 	<tr>
diff --git a/e107_plugins/calendar_menu/calendar_shortcodes.php b/e107_plugins/calendar_menu/calendar_shortcodes.php
index 11130fa31..ea246f7ef 100644
--- a/e107_plugins/calendar_menu/calendar_shortcodes.php
+++ b/e107_plugins/calendar_menu/calendar_shortcodes.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_shortcodes.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2007-12-15 16:31:32 $
+|     $Revision: 1.7 $
+|     $Date: 2007-12-15 21:46:20 $
 |     $Author: e107steved $
 |
 +----------------------------------------------------------------------------+
@@ -433,8 +433,8 @@ SC_BEGIN EC_EVENT_CONTACT
 SC_END
 
 SC_BEGIN EC_EVENT_THREAD
-  global  $thisevent;
-  return (isset($thisevent['event_thread']) && ($thisevent['event_thread'] != "")) ? "<a href='{$thisevent['event_thread']}'><img src='".e_PLUGIN."forum/images/".IMODE."/e.png' alt='' style='border:0; vertical-align:middle;' width='16' height='16' /></a> <a href='{$thisevent['event_thread']}'>".EC_LAN_39."</a>" : "";
+  global  $thisevent, $ec_images_path;
+  return (isset($thisevent['event_thread']) && ($thisevent['event_thread'] != "")) ? "<a href='{$thisevent['event_thread']}'><img src='".$ec_images_path."admin_images/forums_32.png' alt='' style='border:0; vertical-align:middle;' width='16' height='16' /></a> <a href='{$thisevent['event_thread']}'>".EC_LAN_39."</a>" : "";
 SC_END
 
 SC_BEGIN EC_EVENT_OPTIONS
diff --git a/e107_plugins/calendar_menu/calendar_template.php b/e107_plugins/calendar_menu/calendar_template.php
index fca52129a..eeb79c64f 100644
--- a/e107_plugins/calendar_menu/calendar_template.php
+++ b/e107_plugins/calendar_menu/calendar_template.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_template.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2007-12-15 16:31:32 $
+|     $Revision: 1.4 $
+|     $Date: 2007-12-15 21:46:20 $
 |     $Author: e107steved $
 |
 +----------------------------------------------------------------------------+
@@ -124,8 +124,8 @@ $sc_style['EC_EVENT_HEADING_DATE']['post'] = "";
 $sc_style['EC_EVENT_DETAILS']['pre'] = "<tr><td colspan='2' class='forumheader3'>";
 $sc_style['EC_EVENT_DETAILS']['post'] = "</td></tr>\n";
 
-$sc_style['EC_EVENT_LOCATION']['pre'] = "<b>".EC_LAN_32."</b> ";
-$sc_style['EC_EVENT_LOCATION']['post'] = "";
+$sc_style['EC_EVENT_LOCATION']['pre'] = "<tr><td colspan='2' class='forumheader3'><b>".EC_LAN_32."</b> ";
+$sc_style['EC_EVENT_LOCATION']['post'] = "</td></tr>";
 
 $sc_style['EC_EVENT_AUTHOR']['pre'] = "<b>".EC_LAN_31."</b> ";
 $sc_style['EC_EVENT_AUTHOR']['post'] = "&nbsp;";
@@ -175,7 +175,7 @@ $EVENT_EVENT_TABLE = "
 	  <table style='width:100%;'  cellspacing='0' cellpadding='0'>
 		<tr><td colspan='2' class='forumheader3'>{EC_EVENT_AUTHOR} {EC_EVENT_CAT_ICON} {EC_EVENT_CATEGORY} {EC_EVENT_CONTACT} {EC_EVENT_OPTIONS}</td></tr>
 		<tr><td colspan='2' class='forumheader3'>{EC_EVENT_EVENT_DATE_TIME}</td></tr>\n
-		<tr><td colspan='2' class='forumheader3'>{EC_EVENT_LOCATION}</td></tr>
+		{EC_EVENT_LOCATION}
 		{EC_EVENT_DETAILS}
 		{EC_EVENT_THREAD}
 	  </table>
diff --git a/e107_plugins/calendar_menu/languages/English.php b/e107_plugins/calendar_menu/languages/English.php
index 6d6672489..57ef3c09f 100644
--- a/e107_plugins/calendar_menu/languages/English.php
+++ b/e107_plugins/calendar_menu/languages/English.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2007-09-04 21:09:47 $
+|     $Revision: 1.4 $
+|     $Date: 2007-12-15 21:46:20 $
 |     $Author: e107steved $
 |
 +----------------------------------------------------------------------------+
@@ -192,7 +192,7 @@ define('EC_LAN_118', "Date format in calendar header:");
 define('EC_LAN_119', "month/year");
 define('EC_LAN_120', "year/month");
 define('EC_LAN_121', "Show Calendar");	
-//define('EC_LAN_122', "Css element to show events on this day (menu)");	
+
 define('EC_LAN_123', "Subscriptions");
 define('EC_LAN_124', "Calendar Subscriptions");
 define('EC_LAN_125', "Categories available for subscription");
@@ -268,7 +268,7 @@ define('EC_ADLAN_A18', "Action");
 define('EC_ADLAN_A19', "Administer Categories");
 define('EC_ADLAN_A20', "Calendar Categories");
 define('EC_ADLAN_A21', "Category name");
-
+define('EC_ADLAN_A22', "Adds a field to be used as a link to a forum thread or external site");	
 define('EC_ADLAN_A23', "Create category");
 define('EC_ADLAN_A24', "Edit category");
 define('EC_ADLAN_A25', "Save");