diff --git a/js/legacy/app.js b/js/legacy/app.js
index 10313674bc..0e5e0046e5 100644
--- a/js/legacy/app.js
+++ b/js/legacy/app.js
@@ -162,12 +162,9 @@ function setup_calendar() {
 		wn.require('lib/js/legacy/widgets/calendar.js');
 
 		if(!_c.calendar) {
-			new_widget('Calendar', function(c) { 
-				_c.calendar = c;
-				_c.calendar.init(p.cont);
-				rename_observers.push(_c.calendar);
-				
-			});
+			_c.calendar = new Calendar();
+			_c.calendar.init(p.cont);
+			rename_observers.push(_c.calendar);
 		}
 	}
 }
diff --git a/js/legacy/form.compressed.js b/js/legacy/form.compressed.js
index 2b4d23a384..3a78902891 100644
--- a/js/legacy/form.compressed.js
+++ b/js/legacy/form.compressed.js
@@ -99,7 +99,8 @@ if(cur_frm.doc.select_print_heading)
 cur_frm.set_print_heading(cur_frm.doc.select_print_heading)
 if(user!='Guest'){$di(this.view_btn_wrapper);if(cur_frm.doc.__archived){$dh(this.view_btn_wrapper);}}else{$dh(this.view_btn_wrapper);$dh(this.print_close_btn);}
 _p.build(this.default_format,print_callback,null,1);}
-_f.Frm.prototype.hide=function(){$dh(this.wrapper);this.display=0;hide_autosuggest();}
+_f.Frm.prototype.hide=function(){$dh(this.wrapper);this.display=0;if(hide_autosuggest)
+hide_autosuggest();}
 _f.Frm.prototype.show_the_frm=function(){if(this.parent.last_displayed&&this.parent.last_displayed!=this){this.parent.last_displayed.defocus_rest();this.parent.last_displayed.hide();}
 if(this.wrapper&&this.wrapper.style.display.toLowerCase()=='none'){$ds(this.wrapper);this.display=1;}
 if(this.meta.in_dialog&&!this.parent.dialog.display){if(!this.meta.istable)
diff --git a/js/legacy/globals.js b/js/legacy/globals.js
index 7c26c7a89d..ad8e552cdd 100644
--- a/js/legacy/globals.js
+++ b/js/legacy/globals.js
@@ -30,6 +30,7 @@ var user_fullname=null;
 var user_email=null;
 var user_img = {};
 var home_page=null;
+var hide_autosuggest=null;
 
 var page_body=null;
 var pscript = {};
diff --git a/js/legacy/report.compressed.js b/js/legacy/report.compressed.js
index fcbceefde1..06e06484eb 100644
--- a/js/legacy/report.compressed.js
+++ b/js/legacy/report.compressed.js
@@ -201,8 +201,7 @@ c.style.color=row.style.color;if(row.style.backgroundColor)
 c.style.backgroundColor=row.style.backgroundColor;if(row.style.fontWeight)
 c.style.fontWeight=row.style.fontWeight;if(row.style.fontSize)
 c.style.fontSize=row.style.fontSize;var w=this.get_col_width(ci);if(w)$w(c,w);c.val=val;var me=this;c.div=$a(c,'div','',{width:(cint(w)-7)+'px'});$s(c.div,val,this.coltypes[ci],this.coloptions[ci])}
-_r.DataTable.prototype.do_print=function(){this._get_query(true);args={query:this.query,title:this.rep_name?this.rep_name:this.dt,colnames:null,colwidhts:null,coltypes:null,has_index:this.has_index,has_headings:this.has_headings,check_limit:1,is_simple:(this.is_simple?'Yes':''),sc_id:(this.search_criteria?this.search_criteria.name:''),filter_values:docstring(this.filter_vals),finder:this.finder?this.finder:null};new_widget('_p.PrintQuery',function(w){if(!_p.print_query)
-_p.print_query=w;_p.print_query.show_dialog(args);},1);}
+_r.DataTable.prototype.do_print=function(){this._get_query(true);args={query:this.query,title:this.rep_name?this.rep_name:this.dt,colnames:null,colwidhts:null,coltypes:null,has_index:this.has_index,has_headings:this.has_headings,check_limit:1,is_simple:(this.is_simple?'Yes':''),sc_id:(this.search_criteria?this.search_criteria.name:''),filter_values:docstring(this.filter_vals),finder:this.finder?this.finder:null};wn.require('lib/js/legacy/widgets/print_query.js');_p.print_query=new _p.PrintQuery();_p.print_query.show_dialog(args);}
 _r.DataTable.prototype.do_export=function(){this._get_query(true);var me=this;export_query(this.query,function(q){export_csv(q,(me.rep_name?me.rep_name:me.dt),(me.search_criteria?me.search_criteria.name:''),me.is_simple,docstring(me.filter_vals));});}
 _r.DataTable.prototype.do_calc=function(){_r.show_calc(this.tab,this.colnames,this.coltypes,1);}
 _r.DataTable.prototype.get_col_data=function(colname){var ci=0;if(!this.htab)return[];for(var i=1;i<this.htab.rows[0].cells.length;i++){var hc=this.htab.rows[0].cells[i];if(hc.val==colname){ci=i;break;}}
diff --git a/js/legacy/webpage/body.js b/js/legacy/webpage/body.js
index 585e203c7a..f49b878f74 100644
--- a/js/legacy/webpage/body.js
+++ b/js/legacy/webpage/body.js
@@ -59,7 +59,8 @@ function Body() {
 
 	this.setup_sidebar_menu = function() {
 		if(this.left_sidebar && this.cp.show_sidebar_menu){
-			new_widget('SidebarMenu', function(m) { sidebar_menu = m; m.make_menu(''); });
+			sidebar_menu = new SidebarMenu();
+			sidebar_menu.make_menu('');
 		}
 	}
 	
diff --git a/js/legacy/webpage/loaders.js b/js/legacy/webpage/loaders.js
index 174635eb22..2cf727c664 100644
--- a/js/legacy/webpage/loaders.js
+++ b/js/legacy/webpage/loaders.js
@@ -5,10 +5,10 @@ function loadreport(dt, rep_name, onload, menuitem, reset_report) {
 	wn.require('lib/js/legacy/report.compressed.js');
 	dt = get_label_doctype(dt);
 	
-	var show_report_builder = function(rb_con) {
+	var show_report_builder = function() {
 		if(!_r.rb_con) {
 			// first load
-			_r.rb_con = rb_con;
+			_r.rb_con = new _r.ReportContainer();
 		}
 				
 		_r.rb_con.set_dt(dt, function(rb) { 
@@ -38,7 +38,7 @@ function loadreport(dt, rep_name, onload, menuitem, reset_report) {
 			}
 		} );
 	}
-	new_widget('_r.ReportContainer', show_report_builder, 1);
+	show_report_builder();
 }
 
 
@@ -65,8 +65,8 @@ function loaddoc(doctype, name, onload, menuitem, from_archive) {
 
 	var show_form = function(f) {
 		// load the frm container
-		if(!_f.frm_con && f) {
-			_f.frm_con = f; //new _f.FrmContainer();
+		if(!_f.frm_con) {
+			_f.frm_con = new _f.FrmContainer(); //new _f.FrmContainer();
 		}		
 				
 		// case A - frm not loaded
@@ -105,7 +105,8 @@ function loaddoc(doctype, name, onload, menuitem, from_archive) {
 	}
 		
 	//// is libary loaded?
-	new_widget('_f.FrmContainer', show_form, 1);
+	
+	show_form();
 }
 
 
@@ -170,7 +171,7 @@ function new_doc(doctype, onload, in_dialog, on_save_callback, cdt, cdn, cnic) {
 		
 	}
 
-	new_widget('_f.FrmContainer', show_form, 1);	
+	show_form();
 }
 var newdoc = new_doc;
 
diff --git a/js/legacy/webpage/uploader.js b/js/legacy/webpage/uploader.js
index 45b82e1303..446a7f4b2f 100644
--- a/js/legacy/webpage/uploader.js
+++ b/js/legacy/webpage/uploader.js
@@ -28,12 +28,6 @@ Uploader = function(parent, args, callback) {
 	var inp = $a_input($a(ul_form,'span'),'submit',null,{marginLeft:'7px'}); inp.value = 'Upload';
 	
 	$y(inp,{width:'80px'});
-	$wid_normal(inp);
-
-	inp.onmouseover = function() { $wid_active(this); }
-	inp.onmouseout = function() { $wid_normal(this); }
-	inp.onmousedown = function() { $wid_pressed(this); }
-	inp.onmouseup = function() { $wid_active(inp); }
 	
 	// dt, dn to show
 	for(var key in args) {
diff --git a/js/legacy/widgets/form/form.js b/js/legacy/widgets/form/form.js
index 34a3def18e..25b9ecf8e7 100644
--- a/js/legacy/widgets/form/form.js
+++ b/js/legacy/widgets/form/form.js
@@ -467,7 +467,8 @@ _f.Frm.prototype.refresh_print_layout = function() {
 _f.Frm.prototype.hide = function() {
 	$dh(this.wrapper);
 	this.display = 0;
-	hide_autosuggest();
+	if(hide_autosuggest)
+		hide_autosuggest();
 }
 
 // --------------------------------------------------------------------------------------
diff --git a/js/legacy/widgets/listing.js b/js/legacy/widgets/listing.js
index bc14369292..1873271eb1 100644
--- a/js/legacy/widgets/listing.js
+++ b/js/legacy/widgets/listing.js
@@ -164,13 +164,9 @@ Listing.prototype.do_print = function() {
 		is_simple:1
 	}
 	
-	new_widget('_p.PrintQuery', function(w) {
-		// global
-		if(!_p.print_query) 
-			_p.print_query = w;
-		
-		_p.print_query.show_dialog(args);	
-	}, 1);
+	wn.require('lib/js/legacy/widgets/print_query.js');	
+	_p.print_query = new _p.PrintQuery();
+	_p.print_query.show_dialog(args);
 }
 
 // -------------------------------------------------------
diff --git a/js/legacy/widgets/report_builder/datatable.js b/js/legacy/widgets/report_builder/datatable.js
index 1879df6483..f7a57d22c7 100644
--- a/js/legacy/widgets/report_builder/datatable.js
+++ b/js/legacy/widgets/report_builder/datatable.js
@@ -477,13 +477,9 @@ _r.DataTable.prototype.do_print = function() {
 		finder: this.finder ? this.finder : null
 	};
 	
-	new_widget('_p.PrintQuery', function(w) {
-		// global
-		if(!_p.print_query) 
-			_p.print_query = w;
-		
-		_p.print_query.show_dialog(args);	
-	}, 1);
+	wn.require('lib/js/legacy/widgets/print_query.js');	
+	_p.print_query = new _p.PrintQuery();
+	_p.print_query.show_dialog(args);
 }
 
 _r.DataTable.prototype.do_export = function() {
diff --git a/js/legacy/widgets/tabbedpage.js b/js/legacy/widgets/tabbedpage.js
index 2b79dff8e5..a3e5def15f 100644
--- a/js/legacy/widgets/tabbedpage.js
+++ b/js/legacy/widgets/tabbedpage.js
@@ -35,7 +35,8 @@ TabbedPage.prototype.add_tab = function(n, onshow, no_body, with_heading) {
 
 	tab.collapse = function() { 
 		if(this.tab_body)$dh(this.tab_body); this.className = '';
-		hide_autosuggest();
+		if(hide_autosuggest)
+			hide_autosuggest();
 	}
 	tab.set_selected = function() { 
 		if(me.cur_tab) me.cur_tab.collapse();
diff --git a/js/legacy/wnf.compressed.js b/js/legacy/wnf.compressed.js
index 4a84b7f543..69359c6786 100644
--- a/js/legacy/wnf.compressed.js
+++ b/js/legacy/wnf.compressed.js
@@ -1,6 +1,6 @@
 
 wn.provide('wn.widgets.form');wn.provide('wn.widgets.report');wn.provide('wn.utils');wn.provide('wn.model');wn.provide('wn.profile');wn.provide('wn.session');wn.provide('_f');wn.provide('_p');wn.provide('_r');wn.provide('_c');wn.provide('_e');wn.provide('_startup_data')
-wn.settings.no_history=1;var NEWLINE='\n';var login_file='';var version='v170';var profile=null;var session={};var is_testing=false;var user=null;var user_defaults=null;var user_roles=null;var user_fullname=null;var user_email=null;var user_img={};var home_page=null;var page_body=null;var pscript={};var selector=null;var keypress_observers=[];var click_observers=[];var top_index=91;var _f={};var _p={};var _e={};var _r={};var FILTER_SEP='\1';var _c={};var widget_files={'_f.FrmContainer':'form.compressed.js','_c.CalendarPopup':'widgets/form/date_picker.js','_r.ReportContainer':'report.compressed.js','_p.PrintQuery':'widgets/print_query.js','Calendar':'widgets/calendar.js','Recommendation':'widgets/recommend.js','RatingWidget':'widgets/rating.js'}
+wn.settings.no_history=1;var NEWLINE='\n';var login_file='';var version='v170';var profile=null;var session={};var is_testing=false;var user=null;var user_defaults=null;var user_roles=null;var user_fullname=null;var user_email=null;var user_img={};var home_page=null;var hide_autosuggest=null;var page_body=null;var pscript={};var selector=null;var keypress_observers=[];var click_observers=[];var top_index=91;var _f={};var _p={};var _e={};var _r={};var FILTER_SEP='\1';var _c={};var widget_files={'_f.FrmContainer':'form.compressed.js','_c.CalendarPopup':'widgets/form/date_picker.js','_r.ReportContainer':'report.compressed.js','_p.PrintQuery':'widgets/print_query.js','Calendar':'widgets/calendar.js','Recommendation':'widgets/recommend.js','RatingWidget':'widgets/rating.js'}
 var frms={};var cur_frm=null;var pscript={};var validated=true;var validation_message='';var tinymce_loaded=null;var cur_autosug=null;var startup_list=[];wn.utils.full_name=function(fn,ln){return fn+(ln?' ':'')+(ln?ln:'')}
 function fmt_money(v){if(v==null||v=='')return'0.00';v=(v+'').replace(/,/g,'');v=parseFloat(v);if(isNaN(v)){return'';}else{var cp=locals['Control Panel']['Control Panel'];var val=2;if(cp.currency_format=='Millions')val=3;v=v.toFixed(2);var delimiter=",";amount=v+'';var a=amount.split('.',2)
 var d=a[1];var i=parseInt(a[0]);if(isNaN(i)){return'';}
@@ -353,8 +353,7 @@ this.loading_img=$a(this.btn_area,'img','',{display:'none',marginBottom:'-2px'})
 $dh(this.btn_area);}
 Listing.prototype.do_print=function(){this.build_query();if(!this.query){alert('No Query!');return;}
 args={query:this.query,title:this.head_text,colnames:this.colnames,colwidths:this.colwidths,coltypes:this.coltypes,has_index:(this.no_index?0:1),has_headings:1,check_limit:1,is_simple:1}
-new_widget('_p.PrintQuery',function(w){if(!_p.print_query)
-_p.print_query=w;_p.print_query.show_dialog(args);},1);}
+wn.require('lib/js/legacy/widgets/print_query.js');_p.print_query=new _p.PrintQuery();_p.print_query.show_dialog(args);}
 Listing.prototype.do_calc=function(){show_calc(this.result_tab,this.colnames,this.coltypes,0)}
 Listing.prototype.add_filter=function(label,ftype,options,tname,fname,cond){if(!this.filter_area){alert('[Listing] make() must be called before add_filter');}
 var me=this;if(!this.filter_set){var h=$a(this.filter_area,'div','',{fontSize:'14px',fontWeight:'bold',marginBottom:'4px'});h.innerHTML='Filter your search';this.filter_area.div=$a(this.filter_area,'div');this.perm=[[1,1],]
@@ -535,7 +534,8 @@ LayoutCell.prototype.hide=function(){$dh(this.wrapper);}
 function TabbedPage(parent,only_labels){this.tabs={};this.items=this.tabs
 this.cur_tab=null;this.label_wrapper=$a(parent,'div','box_label_wrapper',{marginTop:'16px'});this.label_body=$a(this.label_wrapper,'div','box_label_body');this.label_area=$a(this.label_body,'ul','box_tabs');if(!only_labels)this.body_area=$a(parent,'div','',{backgroundColor:'#FFF'});else this.body_area=null;this.add_item=function(label,onclick,no_body,with_heading){this.add_tab(label,onclick,no_body,with_heading);return this.items[label];}}
 TabbedPage.prototype.add_tab=function(n,onshow,no_body,with_heading){var tab=$a(this.label_area,'li');tab.label=$a(tab,'a');tab.label.innerHTML=n;if(this.body_area&&!no_body){tab.tab_body=$a(this.body_area,'div');$dh(tab.tab_body);tab.body=tab.tab_body;}else{tab.tab_body=null;}
-tab.onshow=onshow;var me=this;tab.collapse=function(){if(this.tab_body)$dh(this.tab_body);this.className='';hide_autosuggest();}
+tab.onshow=onshow;var me=this;tab.collapse=function(){if(this.tab_body)$dh(this.tab_body);this.className='';if(hide_autosuggest)
+hide_autosuggest();}
 tab.set_selected=function(){if(me.cur_tab)me.cur_tab.collapse();this.className='box_tab_selected';$op(this,100);me.cur_tab=this;}
 tab.expand=function(arg){this.set_selected();if(this.tab_body)$ds(this.tab_body);if(this.onshow)this.onshow(arg);}
 tab.onmouseover=function(){if(me.cur_tab!=this)this.className='box_tab_mouseover';}
@@ -702,20 +702,20 @@ d.make_body([['HTML','info']]);d.rows['info'].innerHTML="<div style='padding: 16
 +"<p>Website: <a href='http://wnframework.org'>http://wnframework.org/</a></p>"
 +"</div>";about_dialog=d;}
 about_dialog.show();}
-function loadreport(dt,rep_name,onload,menuitem,reset_report){wn.require('lib/js/legacy/report.compressed.js');dt=get_label_doctype(dt);var show_report_builder=function(rb_con){if(!_r.rb_con){_r.rb_con=rb_con;}
+function loadreport(dt,rep_name,onload,menuitem,reset_report){wn.require('lib/js/legacy/report.compressed.js');dt=get_label_doctype(dt);var show_report_builder=function(){if(!_r.rb_con){_r.rb_con=new _r.ReportContainer();}
 _r.rb_con.set_dt(dt,function(rb){if(rep_name){var t=rb.current_loaded;rb.load_criteria(rep_name);if(onload)
 onload(rb);if((rb.dt)&&(!rb.dt.has_data()||rb.current_loaded!=t))
 rb.dt.run();}else{if(reset_report){rb.reset_report();}}
 if(!rb.forbidden){page_body.change_to('Report Builder');nav_obj.open_notify('Report',dt,rep_name);}});}
-new_widget('_r.ReportContainer',show_report_builder,1);}
+show_report_builder();}
 var load_doc=loaddoc;function loaddoc(doctype,name,onload,menuitem,from_archive){wn.require('lib/js/legacy/form.compressed.js');doctype=get_label_doctype(doctype);if(frms['DocType']&&frms['DocType'].opendocs[doctype]){msgprint("Cannot open an instance of \""+doctype+"\" when the DocType is open.");return;}
 if(doctype=='DocType'&&frms[name]){msgprint("Cannot open DocType \""+name+"\" when its instance is open.");return;}
-var show_form=function(f){if(!_f.frm_con&&f){_f.frm_con=f;}
+var show_form=function(f){if(!_f.frm_con){_f.frm_con=new _f.FrmContainer();}
 if(!frms[doctype]){_f.add_frm(doctype,show_doc,name,from_archive);}else if(LocalDB.is_doc_loaded(doctype,name)){show_doc();}else{$c('webnotes.widgets.form.getdoc',{'name':name,'doctype':doctype,'user':user,'from_archive':(from_archive?1:0)},show_doc,null,null);}}
 var show_doc=function(r,rt){if(locals[doctype]&&locals[doctype][name]){page_body.set_status('Done');var frm=frms[doctype];frm.refresh(name);if(!frm.in_dialog)
 nav_obj.open_notify('Form',doctype,name);if(onload)onload();}else{if(r.exc){msgprint('There were errors while loading '+doctype+' '+name);}
 loadpage('_home');}}
-new_widget('_f.FrmContainer',show_form,1);}
+show_form();}
 function new_doc(doctype,onload,in_dialog,on_save_callback,cdt,cdn,cnic){wn.require('lib/js/legacy/form.compressed.js');doctype=get_label_doctype(doctype);if(!doctype){if(cur_frm)doctype=cur_frm.doctype;else return;}
 var show_doc=function(){frm=frms[doctype];if(frm.perm[0][CREATE]==1){if(frm.meta.issingle){var dn=doctype;LocalDB.set_default_values(locals[doctype][doctype]);}else
 var dn=LocalDB.create(doctype);if(onload)onload(dn);if(frm.in_dialog){var fd=_f.frm_dialog;fd.cdt=cdt;fd.cdn=cdn;fd.cnic=cnic;fd.on_save_callback=on_save_callback;}else{nav_obj.open_notify('Form',doctype,dn);}
@@ -724,7 +724,7 @@ var show_form=function(){if(!_f.frm_con){_f.frm_con=new _f.FrmContainer();}
 if(!frms[doctype])
 _f.add_frm(doctype,show_doc);else
 show_doc(frms[doctype]);}
-new_widget('_f.FrmContainer',show_form,1);}
+show_form();}
 var newdoc=new_doc;var pscript={};var cur_page;function loadpage(page_name,call_back,no_history){if(page_name=='_home')
 page_name=home_page;var fn=function(r,rt){page_body.set_status('Done');if(page_body.pages[page_name]){var p=page_body.pages[page_name]
 page_body.change_to(page_name);}else{var p=render_page(page_name);if(!p)return;}
@@ -738,11 +738,7 @@ function loadscript(src,call_back){set_loading();var script=$a('head','script');
 script.onreadystatechange=function(){if(this.readyState=='complete'||this.readyState=='loaded'){hide_loading();call_back();}}}
 var doc_browser_page;function loaddocbrowser(dt,label,fields){wn.require('lib/js/legacy/widgets/form/fields.js');wn.require('lib/js/legacy/webpage/docbrowser.js');dt=get_label_doctype(dt);if(!doc_browser_page)
 doc_browser_page=new ItemBrowserPage();doc_browser_page.show(dt,label,fields);nav_obj.open_notify('List',dt,'');}
-var uploaders={};var upload_frame_count=0;Uploader=function(parent,args,callback){var id='frame'+upload_frame_count;upload_frame_count++;this.callback=callback;var div=$a(parent,'div');div.innerHTML='<iframe id="'+id+'" name="'+id+'" src="blank1.html" style="width:0px; height:0px; border:0px"></iframe>';var div=$a(parent,'div');div.innerHTML='<form method="POST" enctype="multipart/form-data" action="'+outUrl+'" target="'+id+'"></form>';var ul_form=div.childNodes[0];var f_list=[];var inp_fdata=$a_input($a(ul_form,'span'),'file',{name:'filedata'},{marginLeft:'7px'});var inp=$a_input($a(ul_form,'span'),'hidden',{name:'cmd'});inp.value='uploadfile';var inp=$a_input($a(ul_form,'span'),'hidden',{name:'uploader_id'});inp.value=id;var inp=$a_input($a(ul_form,'span'),'submit',null,{marginLeft:'7px'});inp.value='Upload';$y(inp,{width:'80px'});$wid_normal(inp);inp.onmouseover=function(){$wid_active(this);}
-inp.onmouseout=function(){$wid_normal(this);}
-inp.onmousedown=function(){$wid_pressed(this);}
-inp.onmouseup=function(){$wid_active(inp);}
-for(var key in args){var inp=$a_input($a(ul_form,'span'),'hidden',{name:key});inp.value=args[key];}
+var uploaders={};var upload_frame_count=0;Uploader=function(parent,args,callback){var id='frame'+upload_frame_count;upload_frame_count++;this.callback=callback;var div=$a(parent,'div');div.innerHTML='<iframe id="'+id+'" name="'+id+'" src="blank1.html" style="width:0px; height:0px; border:0px"></iframe>';var div=$a(parent,'div');div.innerHTML='<form method="POST" enctype="multipart/form-data" action="'+outUrl+'" target="'+id+'"></form>';var ul_form=div.childNodes[0];var f_list=[];var inp_fdata=$a_input($a(ul_form,'span'),'file',{name:'filedata'},{marginLeft:'7px'});var inp=$a_input($a(ul_form,'span'),'hidden',{name:'cmd'});inp.value='uploadfile';var inp=$a_input($a(ul_form,'span'),'hidden',{name:'uploader_id'});inp.value=id;var inp=$a_input($a(ul_form,'span'),'submit',null,{marginLeft:'7px'});inp.value='Upload';$y(inp,{width:'80px'});for(var key in args){var inp=$a_input($a(ul_form,'span'),'hidden',{name:key});inp.value=args[key];}
 uploaders[id]=this;}
 function upload_callback(id,fid){uploaders[id].callback(fid);}
 var pages=[];var stylesheets=[];function Page(page_name,content){var me=this;this.name=page_name;this.onshow=function(){set_title(me.doc.page_title?me.doc.page_title:me.name);try{if(pscript['onshow_'+me.name])pscript['onshow_'+me.name]();}catch(e){submit_error(e);}
@@ -874,7 +870,7 @@ n=n+1;return n;}
 this.setup_page_areas=function(){var n=this.no_of_columns();this.body_table=make_table(this.body,1,n,'100%');$y(this.body_table,{tableLayout:'fixed'});var c=0;this.left_sidebar=$td(this.body_table,0,c);$y(this.left_sidebar,{width:cint(this.cp.left_sidebar_width)+'px'});c++;this.center=$a($td(this.body_table,0,c),'div');c++;if(cint(this.cp.right_sidebar_width)){this.right_sidebar=$td(this.body_table,0,c);$y(this.right_sidebar,{width:cint(this.cp.right_sidebar_width)+'px'})
 c++;}
 this.center.header=$a(this.center,'div');this.center.body=$a(this.center,'div');this.center.loading=$a(this.center,'div','',{margin:'200px 0px',fontSize:'14px',color:'#999',textAlign:'center'});this.center.loading.innerHTML='Loading...'}
-this.setup_sidebar_menu=function(){if(this.left_sidebar&&this.cp.show_sidebar_menu){new_widget('SidebarMenu',function(m){sidebar_menu=m;m.make_menu('');});}}
+this.setup_sidebar_menu=function(){if(this.left_sidebar&&this.cp.show_sidebar_menu){sidebar_menu=new SidebarMenu();sidebar_menu.make_menu('');}}
 this.setup_header_footer=function(){if(cint(this.cp.header_height)){var hh=this.cp.header_height?(cint(this.cp.header_height)+'px'):'0px';$y(this.header,{height:hh,borderBottom:'1px solid #CCC'});if(this.cp.client_name)this.banner_area.innerHTML=this.cp.client_name;}
 var fh=this.cp.footer_height?(cint(this.cp.footer_height)+'px'):'0px';$y(this.footer,{height:fh});if(this.cp.footer_html)this.footer.innerHTML=this.cp.footer_html;}
 this.run_startup_code=function(){if(this.cp.startup_css)
@@ -923,7 +919,7 @@ d.innerHTML=html
 $(d).printElement();}
 _p.preview=function(html){var w=window.open('');w.document.write(html)
 w.document.close();}
-function setup_calendar(){var p=new Page('_calendar');p.wrapper.style.height='100%';p.wrapper.onshow=function(){wn.require('lib/js/legacy/widgets/calendar.js');if(!_c.calendar){new_widget('Calendar',function(c){_c.calendar=c;_c.calendar.init(p.cont);rename_observers.push(_c.calendar);});}}}
+function setup_calendar(){var p=new Page('_calendar');p.wrapper.style.height='100%';p.wrapper.onshow=function(){wn.require('lib/js/legacy/widgets/calendar.js');if(!_c.calendar){_c.calendar=new Calendar();_c.calendar.init(p.cont);rename_observers.push(_c.calendar);}}}
 startup_list.push(setup_calendar);if(isIE6){var scroll_list=[]
 window.onscroll=function(){for(var i=0;i<scroll_list.length;i++){scroll_list[i]();}}}
 var resize_observers=[]