diff --git a/upload/styles/cbv2new/layout/global_header.html b/upload/styles/cbv2new/layout/global_header.html
index bd421254..e6585640 100644
--- a/upload/styles/cbv2new/layout/global_header.html
+++ b/upload/styles/cbv2new/layout/global_header.html
@@ -63,95 +63,9 @@ var imageurl = '{$imageurl}';
 
 
 
-{if $smarty.const.THIS_PAGE == 'upload' && $step =="2"}
-
-<script src="{$js}/swfupload/swfupload.js" type="text/javascript"></script>
-<script src="{$js}/swfupload/plugins/all_in_one.js" type="text/javascript"></script>
-
-<script type="text/javascript">
-		var swfu;
-		var file_name = '{$file_name}';
-{literal}
-		
-		window.onload = function() {
-			var settings = {
-				{/literal}
-				
-				flash_url : "{$js}/swfupload/swfupload.swf",
-				upload_url: "{$baseurl}/actions/file_uploader.php",
-				button_image_url: "{$imageurl}/cb_button.png",
-				post_params: 
-				{literal}
-				{
-				{/literal}
-					"file_name" : file_name,
-				{literal}
-				}
-				{/literal},
-				
-				
-				file_size_limit : "{$Cbucket->configs.max_upload_size} MB",				
-				file_types : "{$Cbucket->list_extensions()}",
-				file_types_description : "Video Files",
-				file_upload_limit : 1,
-				file_queue_limit : 0,
-				
-				{literal}
-				custom_settings : {
-					progressTarget : "fsUploadProgress",
-					cancelButtonId : "btnCancel"
-				},
-				debug: false,
-
-				// Button settings
-				
-				button_placeholder_id: "spanButtonPlaceHolder",
-				button_width: 77,
-				button_height: 22,
-				button_text_style: ".cb_button_font { font-weight:bold; font-family:Arial, Helvetica, sans-serif;font-size:12;color:#333}",
-				button_text_left_padding: 18,
-				button_text_top_padding: 2,
-
-				button_text: '<span class="cb_button_font">Upload</span>',
-				
-				// The event handler functions are defined in handlers.js
-				file_queued_handler 			: fileQueued,
-				file_queue_error_handler 		: fileQueueError,
-				file_dialog_complete_handler 	: fileDialogComplete,
-				upload_start_handler 			: uploadStart,
-				upload_progress_handler 		: uploadProgress,
-				upload_error_handler 			: uploadError,
-				upload_success_handler 			: uploadSuccess,
-				upload_complete_handler 		: uploadComplete,
-				queue_complete_handler 			: queueComplete	// Queue plugin event
-				
-
-			}
-
-			swfu = new SWFUpload(settings);
-			
-			load_quicklist_box();
-			ini_cookies();
-	     };
-{/literal}
-</script>
-
-{else}
-<script type="text/javascript">
-{literal}
-window.onload = function() {
-	load_quicklist_box();
-	ini_cookies();
-}
-{/literal}
-</script>
-{/if}
-
 <!-- Including Plugin Headers -->
-{foreach key=file item=pages from=$Cbucket->header_files}
-	{if is_includeable($pages)}
-    	{include file=$file}
-    {/if}
+{foreach key=file item=type from=$Cbucket->header_files}
+	{include_header file=$file type=$type}
 {/foreach}
 <!-- Including Plugin Headers -->
 
@@ -166,9 +80,45 @@ var mid  = {$smarty.get.mid};
 </script>
 {/if}
 
+<!-- Including Common Js -->
+{include_header file='global_header'}
+<!-- End Including Common Js -->
+
 {literal}
 <script type="text/javascript">
 	
+	$(document).ready(function() {					   
+	$('.user_login').hide();					   
+	
+	$('#user_login').toggle(
+		function() {
+			$('.user_login').slideDown('normal');
+		},
+		function() {
+			$('.user_login').slideUp('normal');
+		}
+								
+	);
+		
+	$('.tabs li').click(
+		function() {
+			$('.tabs li').removeClass('selected')
+			$(this).addClass('selected');
+		}
+	);
+	$('#lang_selector').click(function(){
+  	//do redirection
+	});
+	
+		$('#lang_selector').change(function(){
+		  var optionSelectedValue = $('#lang_selector option:selected').val();
+		  if(optionSelectedValue)
+		  window.location = "?set_site_lang="+optionSelectedValue;
+		});
+		get_video('recent_viewed_vids','#index_vid_container');
+		
+	});
+
 	function ToggleView(obj) {
 		var obj = $(obj),
 			obj_id = obj.attr('id'),
@@ -185,55 +135,6 @@ var mid  = {$smarty.get.mid};
 				$('.vid_sp').show();				
 			}
 	}
-	
-$(document).ready(function() {					   
-	$('.user_login').hide();					   
-	
-	$('#user_login').toggle(
-		function() {
-			$('.user_login').slideDown('normal');
-		},
-		function() {
-			$('.user_login').slideUp('normal');
-		}
-								
-	);
-	
-//	$('#grid').click(
-//		function() {
-//			$('.grid_view').removeClass('list_view');
-//			$.cookie("current_style","grid_view")
-//			$('.vid_sp').hide();
-//		}
-//	);
-//	
-//	$('#list').click(
-//		function() {
-//			$('.grid_view').addClass('list_view');
-//			$.cookie("current_style","list_view")
-//			$('.vid_sp').show();
-//		}
-//	);	
-	
-	$('.tabs li').click(
-		function() {
-			$('.tabs li').removeClass('selected')
-			$(this).addClass('selected');
-		}
-	);
-	$('#lang_selector').click(function(){
-  //do redirection
-});
-
-	$('#lang_selector').change(function(){
-	  var optionSelectedValue = $('#lang_selector option:selected').val();
-	  if(optionSelectedValue)
-	  window.location = "?set_site_lang="+optionSelectedValue;
-	});
-	get_video('recent_viewed_vids','#index_vid_container');
-	
-});
-
 
 </script>
 {/literal}
diff --git a/upload/styles/cbv2new/layout/header.html b/upload/styles/cbv2new/layout/header.html
index c5fd9d84..deb4327f 100644
--- a/upload/styles/cbv2new/layout/header.html
+++ b/upload/styles/cbv2new/layout/header.html
@@ -5,6 +5,7 @@
 	<div>
     <a href="{$baseurl}"><img src="{$imageurl}/dot.gif" alt="{cbtitle}" name="logo_icon" width="348" height="53" border="0" id="logo_icon" title="{cbtitle}"  class="logo"></a>
 </div> <!--LOGO END-->
+{ANCHOR place='mature_content'}
     <div class="login_con clearfix">
         <div class="user_login clearfix">
         {if !$userquery->login_check('',true)}
diff --git a/upload/styles/cbv2new/theme/main.css b/upload/styles/cbv2new/theme/main.css
index ed66fdc0..155f2149 100644
--- a/upload/styles/cbv2new/theme/main.css
+++ b/upload/styles/cbv2new/theme/main.css
@@ -765,8 +765,24 @@ ul.upload_opts li.selected { cursor:pointer; background:none; border:1px solid;
 
 .subsription a{text-decoration:none; font-size:14px; font-family:Arial, Helvetica, sans-serif; display:block; border-bottom:1px solid #CCC; padding-bottom:5px; margin-bottom:5px; color:#06c; font-weight:bold}
 
+
+.remote_main_bar
+{
+	width:400px;
+	height:30px;
+	border:1px solid #666;
+}
+
+.remote_prog_bar
+{
+	height:30px;
+	background-color:#53baff;
+	text-align:center;
+	line-height:30px;
+	width:0px
+}
 /* COLLECTION */
-.collect_grid { padding:5px;  border:1px solid #FFF; height:120px; margin:0 0 10px -1px; position:relative; -moz-border-radius:6px; -webkit-border-radius:6px; border-radius:6px;}
+.collect_grid { padding:5px;  border:1px solid #FFF; height:120px; margin:0 0 10px -1px; position:relative; -moz-border-radius:6px; }
 .collect_grid:hover { border-color:#CCC; background:#fafafa; z-index:50; cursor:pointer; }
 .collect_grid.selected { background:url(../images/simple_gradient.png) bottom repeat-x; border:1px solid #aaa; z-index:51; }
 .collect_grid:first-child { margin-left:none; }
diff --git a/upload/styles/global/head.html b/upload/styles/global/head.html
new file mode 100644
index 00000000..0d833842
--- /dev/null
+++ b/upload/styles/global/head.html
@@ -0,0 +1,101 @@
+{if $smarty.const.THIS_PAGE == 'upload' && $step =="2"}
+
+<script src="{$js}/swfupload/swfupload.js" type="text/javascript"></script>
+<script src="{$js}/swfupload/plugins/all_in_one.js" type="text/javascript"></script>
+<script type="text/javascript">
+{assign var="get_api_server" value=$multi_server->get_server_api()}
+
+{if $get_api_server}
+	var result_page = '{$get_api_server.server_api_path}/actions/file_results.php';
+	var download_page = '{$get_api_server.server_api_path}/actions/file_downloader.php';
+{/if}
+
+		var swfu;
+		var file_name = '{$file_name}';
+{literal}
+		
+window.onload = function() {
+	var settings = {
+		{/literal}
+		
+		
+		{if $get_api_server}
+			flash_url : "{$get_api_server.server_api_path}/js/swfupload/swfupload.swf",
+			upload_url: "{$get_api_server.server_api_path}/actions/file_uploader.php",
+		{else}
+			flash_url : "{$js}/swfupload/swfupload.swf",
+			upload_url: "{$baseurl}/actions/file_uploader.php",
+		{/if}
+		
+		button_image_url: "{$imageurl}/cb_button.png",
+		post_params: 
+		{literal}
+		{
+		{/literal}
+			"file_name" : file_name
+		{literal}
+		}
+		{/literal},
+		
+		
+		file_size_limit : "{$Cbucket->configs.max_upload_size} MB",				
+		file_types : "{$Cbucket->list_extensions()}",
+		file_types_description : "Video Files",
+		file_upload_limit : 1,
+		file_queue_limit : 0,
+		
+		{literal}
+		custom_settings : {
+			progressTarget : "fsUploadProgress",
+			cancelButtonId : "btnCancel"
+		},
+		debug: false,
+
+		// Button settings
+		
+		button_placeholder_id: "spanButtonPlaceHolder",
+		button_width: 77,
+		button_height: 22,
+		button_text_style: ".cb_button_font { font-weight:bold; font-family:Arial, Helvetica, sans-serif;font-size:12;color:#333}",
+		button_text_left_padding: 18,
+		button_text_top_padding: 2,
+
+		button_text: '<span class="cb_button_font">Upload</span>',
+		
+		// The event handler functions are defined in handlers.js
+		file_queued_handler 			: fileQueued,
+		file_queue_error_handler 		: fileQueueError,
+		file_dialog_complete_handler 	: fileDialogComplete,
+		upload_start_handler 			: uploadStart,
+		upload_progress_handler 		: uploadProgress,
+		upload_error_handler 			: uploadError,
+		upload_success_handler 			: uploadSuccess,
+		upload_complete_handler 		: uploadComplete,
+		queue_complete_handler 			: queueComplete	// Queue plugin event
+		
+
+	}
+
+	swfu = new SWFUpload(settings);
+	
+	load_quicklist_box();
+	ini_cookies();
+ };
+{/literal}
+</script>
+
+{else}
+<script type="text/javascript">
+{literal}
+window.onload = function() {
+	load_quicklist_box();
+	ini_cookies();
+}
+{/literal}
+</script>
+{/if}
+
+{literal}
+<script type="text/javascript">
+</script>
+{/literal}
\ No newline at end of file