Index: branches/1.2.x/platform/designs/default_design.des.tpl
===================================================================
diff -u -r13827 -r14083
--- branches/1.2.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 13827)
+++ branches/1.2.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14083)
@@ -17,6 +17,19 @@
 
 		<link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress from='all_css'/>" type="text/css" />
 		<script type="text/javascript" src="<inp2:m_Compress from='all_js'/>"></script>
+		
+		<script type="text/javascript">
+			var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');				
+		
+			<inp2:m_Cache key="prefix:lang;skip_var:t,page,per_page,sort_by">
+				<inp2:m_DefineElement name="ml_selector_language_element">
+					<inp2:Field name="LanguageId"/>: {'on': '<inp2:Field name="IconURL" js_ecape="1"/>', 'off': '<inp2:Field name="IconDisabledURL" js_ecape="1"/>'}
+					<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
+				</inp2:m_DefineElement>
+				
+				var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);					
+			</inp2:m_Cache>
+		</script>
 
 		<inp2:st_EditingScripts/>
 		<!--## /Include module specific HEADER template ##-->
Index: branches/1.2.x/platform/categories/suggest_pending_confirm.tpl
===================================================================
diff -u -r13827 -r14083
--- branches/1.2.x/platform/categories/suggest_pending_confirm.tpl	(.../suggest_pending_confirm.tpl)	(revision 13827)
+++ branches/1.2.x/platform/categories/suggest_pending_confirm.tpl	(.../suggest_pending_confirm.tpl)	(revision 14083)
@@ -41,8 +41,7 @@
 					<inp2:m_phrase name="lu_title_SuggestCategoryPendingConfirm"/>
 				</inp2:m_Capture>
 
-				<inp2:m_phrase name="lu_text_SuggestCategoryPendingConfirm"/><br /><br />
-				<a href="<inp2:c_CategoryLink template="__default__" cat_id="current" />"><inp2:c_Field name="Name"/></a>
+				<inp2:m_phrase name="lu_text_SuggestCategoryPendingConfirm"/><br />
 			</inp2:m_RenderElement>
 			<!-- // suggest category pending confirm -->
 		</div>
Index: branches/1.2.x/in-bulletin/elements/content_boxes/add_poll_comment.elm.tpl
===================================================================
diff -u -r13827 -r14083
--- branches/1.2.x/in-bulletin/elements/content_boxes/add_poll_comment.elm.tpl	(.../add_poll_comment.elm.tpl)	(revision 13827)
+++ branches/1.2.x/in-bulletin/elements/content_boxes/add_poll_comment.elm.tpl	(.../add_poll_comment.elm.tpl)	(revision 14083)
@@ -1,46 +1,50 @@
 <inp2:m_DefineElement name="content">
-	<inp2:poll-comment_PresetFormFields/>
 	<br/>
-	<form method="post" id="poll_comment_form" action="<inp2:m_Link height='480' width='480' pass='m,poll,poll-comment' poll-comment_event='OnCreate' __NO_REWRITE__='1'/>">
-	<table class="form-data fullwidth">
-		<inp2:m_ifnot check="m_LoggedIn">
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestName" title="lu_fld_Name" style="width:200px"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestEmail" title="lu_fld_Email" style="width:200px"/>
-		</inp2:m_ifnot>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="poll-comment" field="CommentBody" rows="8" cols="40" title="lu_fld_Comment" is_last="1"/>
-		<inp2:m_RenderElement design="inp_edit_buttons">
-			<input type="hidden" name="success_template" value="in-bulletin/elements/content_boxes/poll_comments.elm" />
-			<input class="button" id="add_comment_btn" type="button" name="events[poll-comment][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>" />
-			<input class="button" type="reset" name="reset" value="<inp2:m_Phrase label="lu_btn_Reset" no_editing="1"/>" />
-		</inp2:m_RenderElement>
-	</table>
+
+	<inp2:poll-comment_PresetFormFields/>
+	<form method="post" id="poll_comment_form" action="<inp2:m_Link width='480' height='480' pass='m,poll'/>">
+		<table class="form-data fullwidth">
+			<inp2:m_ifnot check="m_LoggedIn">
+				<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestName" title="lu_fld_Name" style="width:200px"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestEmail" title="lu_fld_Email" style="width:200px"/>
+			</inp2:m_ifnot>
+
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="poll-comment" field="CommentBody" rows="8" cols="40" title="lu_fld_Comment" is_last="1"/>
+
+			<inp2:m_RenderElement design="inp_edit_buttons">
+				<input type="hidden" name="events[poll-comment]" value="OnCreate"/>
+				<input type="hidden" name="success_template" value="in-bulletin/elements/content_boxes/poll_comments.elm" />
+				<input class="button" id="add_comment_btn" type="button" value="<inp2:m_Phrase label='lu_btn_Create' no_editing='1'/>" />
+				<input class="button" type="reset" name="reset" value="<inp2:m_Phrase label='lu_btn_Reset' no_editing='1'/>" />
+			</inp2:m_RenderElement>
+		</table>
 	</form>
 	<script language="javascript" type="text/javascript">
-	$(document).ready(
-		function() {
-			$('#add_comment_btn').click(
-      			function ($e) {
-					TB.show(
-			          {
-			               url: $('#poll_comment_form').attr('action'),
-			               postParams: $('#poll_comment_form').serializeArray(),
-			               showCallback: function() {
-    	                		var $match_redirect = new RegExp('^#redirect#(.*)').exec($('#TB_ajaxContent').html());
-							     if ($match_redirect != null) {
-							          // redirect to external template requested
-							          TB.show( {url: $match_redirect[1]+'&height=480&width=480'} );
-							          return true;
-							     }
-			          		}
-			          	}
-			     	);
-      			}
-			)
-		}
-	);
+		$(document).ready(
+			function() {
+				$('#add_comment_btn').click(
+					function ($e) {
+						TB.show(
+							{
+								url: $('#poll_comment_form').attr('action'),
+								postParams: $('#poll_comment_form').serialize(),
+								onDataReceived: function($data, params) {
+									var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($data);
 
+									if ($match_redirect != null) {
+										TB.show( {url: $match_redirect[1] + '&height=480&width=480'} );
 
+										return false;
+									}
 
+									return $data;
+								}
+							}
+						);
+					}
+				)
+			}
+		);
 	</script>
 
 </inp2:m_DefineElement>
Index: branches/1.2.x/in-bulletin/topics/topic_detail.tpl
===================================================================
diff -u -r13827 -r14083
--- branches/1.2.x/in-bulletin/topics/topic_detail.tpl	(.../topic_detail.tpl)	(revision 13827)
+++ branches/1.2.x/in-bulletin/topics/topic_detail.tpl	(.../topic_detail.tpl)	(revision 14083)
@@ -29,7 +29,7 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_TopicPosts" templates="__default__,in-bulletin/designs/post_list" show_category="1"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_TopicPosts" templates="__default__,in-bulletin/topics/topic_detail" show_category="1"/>
 		</div>
 		<div class="movable-element">
 			<!-- posts in topic -->
Index: branches/1.2.x/_install/english.lang
===================================================================
diff -u -r13827 -r14083
--- branches/1.2.x/_install/english.lang	(.../english.lang)	(revision 13827)
+++ branches/1.2.x/_install/english.lang	(.../english.lang)	(revision 14083)
@@ -239,7 +239,7 @@
 			<PHRASE Label="lu_password" Module="Core" Type="0">UGFzc3dvcmQ=</PHRASE>
 			<PHRASE Label="lu_passwords_do_not_match" Module="Core" Type="0">UGFzc3dvcmRzIGRvIG5vdCBtYXRjaA==</PHRASE>
 			<PHRASE Label="lu_passwords_too_short" Module="Core" Type="0">UGFzc3dvcmQgaXMgdG9vIHNob3J0LCBwbGVhc2UgZW50ZXIgYXQgbGVhc3QgJXMgY2hhcmFjdGVycw==</PHRASE>
-			<PHRASE Label="lu_PendingItem" Module="Core" Type="0">cGVuZGluZyBpdGVt</PHRASE>			
+			<PHRASE Label="lu_PendingItem" Module="Core" Type="0">cGVuZGluZyBpdGVt</PHRASE>
 			<PHRASE Label="lu_phone" Module="Core" Type="0">UGhvbmU=</PHRASE>
 			<PHRASE Label="lu_pick" Module="Core" Type="0">UGljaw==</PHRASE>
 			<PHRASE Label="lu_PleaseRegister" Module="Core" Type="0">UGxlYXNlIFJlZ2lzdGVy</PHRASE>
@@ -261,7 +261,7 @@
 			<PHRASE Label="lu_RecommendToFriend" Module="Core" Type="0">UmVjb21tZW5kIHRvIGEgRnJpZW5k</PHRASE>
 			<PHRASE Label="lu_recommend_confirm" Module="Core" Type="0">UmVjb21tZW5kYXRpb24gQ29uZmlybWF0aW9u</PHRASE>
 			<PHRASE Label="lu_recommend_confirm_text" Module="Core" Type="0">VGhhbmtzIGZvciByZWNvbW1lbmRpbmcgb3VyIHNpdGUgdG8geW91ciBmcmllbmQuIFRoZSBlbWFpbCBoYXMgYmVlbiBzZW50IG91dC4=</PHRASE>
-			<PHRASE Label="lu_recommend_title" Module="Core" Type="0">UmVjb21tZW5kIHRvIGEgZnJpZW5k</PHRASE>			
+			<PHRASE Label="lu_recommend_title" Module="Core" Type="0">UmVjb21tZW5kIHRvIGEgZnJpZW5k</PHRASE>
 			<PHRASE Label="lu_register" Module="Core" Type="0">UmVnaXN0ZXI=</PHRASE>
 			<PHRASE Label="lu_RegisterConfirm" Module="Core" Type="0">UmVnaXN0cmF0aW9uIENvbmZpcm1hdGlvbg==</PHRASE>
 			<PHRASE Label="lu_RegistrationCompleted" Module="Core" Type="0">VGhhbmsgWW91LiBSZWdpc3RyYXRpb24gY29tcGxldGVkLg==</PHRASE>
@@ -275,6 +275,7 @@
 			<PHRASE Label="lu_rootcategory_name" Module="Core" Type="0">SG9tZQ==</PHRASE>
 			<PHRASE Label="lu_search" Module="Core" Type="0">U2VhcmNo</PHRASE>
 			<PHRASE Label="lu_section_AdditionalImages" Module="Core" Type="0">QWRkaXRpb25hbCBJbWFnZXM=</PHRASE>
+			<PHRASE Label="lu_section_Files" Module="Core" Type="0">RmlsZXM=</PHRASE>
 			<PHRASE Label="lu_section_Images" Module="Core" Type="0">SW1hZ2Vz</PHRASE>
 			<PHRASE Label="lu_section_MyAccount" Module="Core" Type="0">TXlBY2NvdW50</PHRASE>
 			<PHRASE Label="lu_section_MyItems" Module="Core" Type="0">TXkgSXRlbXM=</PHRASE>
@@ -304,12 +305,12 @@
 			<PHRASE Label="lu_text_NothingFound" Module="Core" Type="0">Tm90aGluZyBGb3VuZA==</PHRASE>
 			<PHRASE Label="lu_text_pagenotfound" Module="Core" Type="0">NDA0LiBQYWdlIG5vdCBmb3VuZCBvbiB0aGUgc2VydmVyLg==</PHRASE>
 			<PHRASE Label="lu_text_PasswordRequestConfirm" Module="Core" Type="0">UGxlYXNlIGNvbmZpcm0gdGhhdCB5b3Ugd2FudCB0byByZXNldCB5b3VyIHBhc3N3b3JkLg==</PHRASE>
-			<PHRASE Label="lu_text_Redirect" Module="Core" Type="0">Q2xpY2sgaGVyZSBpZiB5b3VyIGJyb3dzZXIgZG9lcyBub3QgYXV0b21hdGljYWxseSByZWRpcmVjdCB5b3Uu</PHRASE>			
+			<PHRASE Label="lu_text_Redirect" Module="Core" Type="0">Q2xpY2sgaGVyZSBpZiB5b3VyIGJyb3dzZXIgZG9lcyBub3QgYXV0b21hdGljYWxseSByZWRpcmVjdCB5b3Uu</PHRASE>
 			<PHRASE Label="lu_text_RegistrationActivationPending" Module="Core" Type="0">VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91IGNhbiBhY3RpdmF0ZSB5b3VyIHJlZ2lzdHJhdGlvbiB1c2luZyBsaW5rIHNlbnQgdG8geW91IGJ5IGVtYWlsLg==</PHRASE>
 			<PHRASE Label="lu_text_RegistrationPending" Module="Core" Type="0">VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91ciByZWdpc3RyYXRpb24gaXMgcGVuZGluZyBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC4gWW91IHdpbGwgZ2V0IGEgc2VwYXJhdGUgZW1haWwgb25jZSBpdCdzIGFjdGl2YXRlZC4=</PHRASE>
 			<PHRASE Label="lu_text_SuggestCategoryConfirm" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWdnZXN0aW5nIHlvdXIgY2F0ZWdvcnku</PHRASE>
 			<PHRASE Label="lu_text_SuggestCategoryPendingConfirm" Module="Core" Type="0">U3VnZ2VzdGVkIGNhdGVnb3J5IGlzIHBlbmRpbmcgZm9yIEFkbWluaXN0cmF0aXZlIGFwcHJvdmFsIA==</PHRASE>
-			<PHRASE Label="lu_text_ThankYou" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgcmVxdWVzdC4=</PHRASE>			
+			<PHRASE Label="lu_text_ThankYou" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgcmVxdWVzdC4=</PHRASE>
 			<PHRASE Label="lu_ThankForSubscribing" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWJzY3JpYmluZyB0byBvdXIgbWFpbGluZyBsaXN0</PHRASE>
 			<PHRASE Label="lu_ThanksForVoting" Module="Core" Type="0">VGhhbmtzIGZvciBWb3Rpbmch</PHRASE>
 			<PHRASE Label="lu_ThisCategory" Module="Core" Type="0">Q3VycmVudCBDYXRlZ29yeQ==</PHRASE>
@@ -386,7 +387,7 @@
 			<PHRASE Label="lu_YourAccount" Module="Core" Type="0">WW91ciBBY2NvdW50</PHRASE>
 			<PHRASE Label="lu_YourLanguage" Module="Core" Type="0">TGFuZ3VhZ2U=</PHRASE>
 			<PHRASE Label="lu_YourWishList" Module="Core" Type="0">WW91ciBXaXNoIExpc3Q=</PHRASE>
-			<PHRASE Label="lu_ZipCode" Module="Core" Type="0">WklQIENvZGU=</PHRASE>			
+			<PHRASE Label="lu_ZipCode" Module="Core" Type="0">WklQIENvZGU=</PHRASE>
 		</PHRASES>
 	</LANGUAGE>
 </LANGUAGES>
\ No newline at end of file
Index: branches/1.2.x/platform/categories/suggest_confirm.tpl
===================================================================
diff -u -r13827 -r14083
--- branches/1.2.x/platform/categories/suggest_confirm.tpl	(.../suggest_confirm.tpl)	(revision 13827)
+++ branches/1.2.x/platform/categories/suggest_confirm.tpl	(.../suggest_confirm.tpl)	(revision 14083)
@@ -41,8 +41,7 @@
 					<inp2:m_phrase name="lu_title_SuggestCategoryConfirm"/>
 				</inp2:m_Capture>
 
-				<inp2:m_phrase name="lu_text_SuggestCategoryConfirm"/><br /><br />
-				<a href="<inp2:c_CategoryLink template="__default__" cat_id="current" />"><inp2:c_Field name="Name"/></a>
+				<inp2:m_phrase name="lu_text_SuggestCategoryConfirm"/><br />
 			</inp2:m_RenderElement>
 			<!-- // suggest category confirm -->
 		</div>
Index: branches/1.2.x/platform/elements/html_head.elm.tpl
===================================================================
diff -u -r13827 -r14083
--- branches/1.2.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13827)
+++ branches/1.2.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14083)
@@ -20,28 +20,3 @@
 <inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
 	<inp2:m_Compress files="platform/inc/jquery/thickbox/thickbox.js" to="all_js"/>
 </inp2:m_ifnot>
-
-<script type="text/javascript">
-	var aRatingManager = null;
-
-	$(document).ready(
-		function () {
-			aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
-		}
-	);
-
-	<inp2:m_Cache key="prefix:lang;skip_var:t,page,per_page,sort_by">
-		<inp2:m_DefineElement name="ml_selector_language_element">
-			<inp2:Field name="LanguageId"/>: {'on': '<inp2:Field name="IconURL" js_ecape="1"/>', 'off': '<inp2:Field name="IconDisabledURL" js_ecape="1"/>'}
-			<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
-		</inp2:m_DefineElement>
-
-		var aMultiLanguageSelector = null;
-
-		$(document).ready(
-			function () {
-				aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
-			}
-		);
-	</inp2:m_Cache>
-</script>
Index: branches/1.2.x/platform/categories/suggest_category.tpl
===================================================================
diff -u -r13827 -r14083
--- branches/1.2.x/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 13827)
+++ branches/1.2.x/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 14083)
@@ -42,24 +42,24 @@
 				</inp2:m_Capture>
 
 				<inp2:m_if check="c_HasPermission" permissions="CATEGORY.ADD|CATEGORY.ADD.PENDING">
-					<inp2:c_PresetFormFields/>
+					<inp2:c.suggest_PresetFormFields/>
 					<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
-					<inp2:m_if check="c_HasError" field="any">
+					<inp2:m_if check="c.suggest_HasError" field="any">
 						<inp2:m_RenderElement name="error_message" />
 					</inp2:m_if>
 
 					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
 					<form method="post" action="<inp2:m_FormAction/>">
 						<table class="form-data fullwidth">
-							<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Name" title="lu_fld_Name"/>
-							<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="Description" cols="30" rows="5" title="lu_fld_Description" is_last="1"/>
+							<inp2:m_RenderElement name="inp_edit_box" prefix="c.suggest" field="Name" title="lu_fld_Name"/>
+							<inp2:m_RenderElement name="inp_edit_textarea" prefix="c.suggest" field="Description" cols="30" rows="5" title="lu_fld_Description" is_last="1"/>
 
 							<inp2:m_RenderElement design="inp_edit_buttons">
 								<input type="hidden" name="suggest_confirm_template" value="platform/categories/suggest_confirm"/>
 								<input type="hidden" name="suggest_pending_confirm_template" value="platform/categories/suggest_pending_confirm"/>
-								<input class="button" type="submit" name="events[c][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
+								<input class="button" type="submit" name="events[c.suggest][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
 							</inp2:m_RenderElement>
 						</table>
 					</form>
Index: branches/1.2.x/in-commerce/_install/english.lang
===================================================================
diff -u -r13827 -r14083
--- branches/1.2.x/in-commerce/_install/english.lang	(.../english.lang)	(revision 13827)
+++ branches/1.2.x/in-commerce/_install/english.lang	(.../english.lang)	(revision 14083)
@@ -435,7 +435,6 @@
 			<PHRASE Label="lu_SameAsShipping" Module="In-Commerce" Type="0">U2FtZSBBcyBTaGlwcGluZyBBZGRyZXNz</PHRASE>
 			<PHRASE Label="lu_section_BillingInfo" Module="In-Commerce" Type="0">QmlsbGluZyBJbmZvcm1hdGlvbg==</PHRASE>
 			<PHRASE Label="lu_section_CostSummary" Module="In-Commerce" Type="0">Q29zdCBTdW1tYXJ5</PHRASE>
-			<PHRASE Label="lu_section_Files" Module="In-Commerce" Type="0">RmlsZXM=</PHRASE>
 			<PHRASE Label="lu_section_OrderTotal" Module="In-Commerce" Type="0">T3JkZXIgVG90YWw=</PHRASE>
 			<PHRASE Label="lu_section_ShippingInfo" Module="In-Commerce" Type="0">U2hpcHBpbmcgSW5mb3JtYXRpb24=</PHRASE>
 			<PHRASE Label="lu_shipping_Company" Module="In-Commerce" Type="0">Q29tcGFueQ==</PHRASE>