diff --git a/docs/create.sql b/docs/create.sql
index c3c0eaa33..13e6ccd86 100644
--- a/docs/create.sql
+++ b/docs/create.sql
@@ -8563,3 +8563,6 @@ CREATE TABLE wobject (
 INSERT INTO wobject VALUES (-1,4,'SiteMap',0,'Page Not Found',1,'The page you were looking for could not be found on this system. Perhaps it has been deleted or renamed. The following list is a site map of this site. If you don\'t find what you\'re looking for on the site map, you can always start from the <a href=\"^/;\">Home Page</a>.',1,1001744792,3,1016077239,3,1,1001744792,1336444487,2,3600,4,0,'after',NULL,NULL,NULL,NULL,NULL);
 INSERT INTO wobject VALUES (-2,1,'Article',1,'Welcome to WebGUI!',1,'<DIV>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\">If you’re reading this message it means that you’ve got WebGUI up and running. Good job! The installation is not trivial.</P>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\"> <?xml:namespace prefix = o ns = \"urn:schemas-microsoft-com:office:office\" /><o:p></o:p></P>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\">In order to do anything useful with your new installation you’ll need to log in as the default administrator account. Follow these steps to get started:</P>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\"> <o:p></o:p></P>\r\n<OL style=\"MARGIN-TOP: 0in\" type=1>\r\n<LI class=MsoNormal style=\"MARGIN: 0in 0in 0pt; mso-list: l1 level1 lfo2; tab-stops: list .5in\"><A href=\"^\\;?op=displayLogin\">Click here to log in.</A> (username: Admin password: 123qwe) \r\n<LI class=MsoNormal style=\"MARGIN: 0in 0in 0pt; mso-list: l1 level1 lfo2; tab-stops: list .5in\"><A href=\"^\\;?op=switchOnAdmin\">Click here to turn the administrative interface on.</A></LI></OL>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\"> Now that you’re in as the administrator, you should <A href=\"^\\;?op=displayAccount\">change your password</A> so no one else can log in and mess with your site. You might also want to <A href=\"^\\;?op=addUser\">create another account </A>for yourself with Administrative privileges in case you can\'t log in with the Admin account for some reason.</P>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\"> <o:p></o:p></P>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\">You’ll notice three menus at the top of your screen. Those are your administrative menus. Going from left to right they are <I>Content</I>, <I>Clipboard</I>, and <I>Admin</I>. The content menu allows you to add new pages and content to your site. The clipboard menu is currently empty, but if you cut or copy anything from any of your pages, it will end up there. The admin menu controls things like system settings and users.</P>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\"> <o:p></o:p></P>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\">For more information about how to administer WebGUI consider getting a copy of <I><A href=\"http://www.plainblack.com/ruling_webgui\">Ruling WebGUI</A></I>. Plain Black Software also provides several <A href=\"http://www.plainblack.com/support_programs\">Support Programs </A>for WebGUI if you run into trouble.</P>\r\n<P class=MsoNormal style=\"MARGIN: 0in 0in 0pt\"> <o:p></o:p></P>Enjoy your new WebGUI site!\r\n</DIV>',1,1023555430,3,1023555630,3,1,1023512400,1338872400,2,3600,4,0,'after',NULL,NULL,NULL,NULL,NULL);
 
+INSERT INTO international VALUES (741,'WebGUI',1,'Edit this template.',1034223116);
+INSERT INTO international VALUES (742,'WebGUI',1,'Manage templates.',1034223130);
+
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 794dc0f3a..3240e70ec 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -36,6 +36,9 @@ save you many hours of grief.
 
  * All FAQ's have been reset to use the default template.
 
+ * You may need to upgrade your CGI bundle because we are now using
+	some of the newer functionality in the CGI::Util package.
+
 4.6.3
 --------------------------------------------------------------------
  * It has been reported that some people had a duplicate key error
diff --git a/docs/upgrades/upgrade_4.6.9-4.7.0.sql b/docs/upgrades/upgrade_4.6.9-4.7.0.sql
index 521cb4640..d46815dd6 100644
--- a/docs/upgrades/upgrade_4.6.9-4.7.0.sql
+++ b/docs/upgrades/upgrade_4.6.9-4.7.0.sql
@@ -1069,6 +1069,11 @@ INSERT INTO template VALUES (3,'Weblog','<tmpl_var searchForm>\r\n\r\n<tmpl_if d
 INSERT INTO template VALUES (4,'Photo Gallery','<tmpl_var searchForm>\r\n\r\n<tmpl_if post>\r\n    <tmpl_var post> &middot;\r\n</tmpl_if>\r\n<tmpl_var search><p/>\r\n\r\n<table width=\"100%\" cellpadding=2 cellspacing=1 border=0>\r\n<tr>\r\n<tmpl_loop submissions_loop>\r\n\r\n<td align=\"center\" class=\"tableData\">\r\n  \r\n  <tmpl_if submission.thumbnail>\r\n       <a href=\"<tmpl_var submission.url>\"><img src=\"<tmpl_var submission.thumbnail>\" border=\"0\"/></a><br/>\r\n  </tmpl_if>\r\n  <a href=\"<tmpl_var submission.url>\"><tmpl_var submission.title></a>\r\n  <tmpl_if submission.currentUser>\r\n    (<tmpl_var submission.status>)\r\n  </tmpl_if>\r\n</td>\r\n\r\n<tmpl_if submission.thirdColumn>\r\n  </tr><tr>\r\n</tmpl_if>\r\n\r\n</tmpl_loop>\r\n</tr>\r\n</table>\r\n\r\n<tmpl_if multiplePages>\r\n  <div class=\"pagination\">\r\n    <tmpl_var previousPage>  &middot; <tmpl_var pageList> &middot; <tmpl_var nextPage>\r\n  </div>\r\n</tmpl_if>\r\n','USS');
 INSERT INTO template VALUES (2,'Item w/pop-up Links','<tmpl_if displaytitle>\r\n   <tmpl_if linkurl>\r\n       <a href=\"<tmpl_var linkurl>\">\r\n    </tmpl_if>\r\n     <span class=\"itemTitle\"><tmpl_var title></span>\r\n   <tmpl_if linkurl>\r\n      </a>\r\n    </tmpl_if>\r\n</tmpl_if>\r\n\r\n<tmpl_if attachment>\r\n   <tmpl_if displaytitle> - </tmpl_if>\r\n   <a href=\"<tmpl_var attachmenturl>\" target=\"_blank\"><img src=\"<tmpl_var attachmentIcon>\" border=0 alt=\"<tmpl_var attachment>\" width=16 height=16 border=0 align=\"middle\"></a>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n  - <tmpl_var description>\r\n</tmpl_if>','Item');
 insert into international (internationalId,languageId,namespace,message,lastUpdated) values (747,1,'WebGUI','Usernames must contain only alpha-numeric characters.', 1036384261);
+INSERT INTO international VALUES (741,'WebGUI',1,'Edit this template.',1034223116);
+INSERT INTO international VALUES (742,'WebGUI',1,'Manage templates.',1034223130);
+update settings set value=value+974 where name='defaultPage' and value>25;
+update settings set value=value+974 where name='notFoundPage' and value>25;
+
 
 
 
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index 54b6c95d1..9169c5490 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -62,8 +62,8 @@ use WebGUI::SQL;
  tag element syntax like this:
 
  $f->checkbox(
-	-name=>"whichOne", 
-	-value=>"red", 
+	-"name"=>"whichOne", 
+	-"value"=>"red", 
 	-label=>"Is red your favorite?"
 	);
 
@@ -162,21 +162,21 @@ sub checkbox {
 	my ($output);
 	my ($self, @p) = @_;
     	my ($name, $label, $checked, $subtext, $value, $extras, $uiLevel) = 
-       		rearrange([name, label, checked, subtext, value, extras, uiLevel], @p);
+		rearrange([qw(name label checked subtext value extras uiLevel)], @p);
 	if (_uiLevelChecksOut($uiLevel)) {
 		$output = WebGUI::Form::checkbox({
-			name=>$name,
-			value=>$value,
-			checked=>$checked,
-			extras=>$extras
+			"name"=>$name,
+			"value"=>$value,
+			"checked"=>$checked,
+			"extras"=>$extras
 			});
 		$output .= _subtext($subtext);
         	$output = $self->_tableFormRow($label,$output);
 	} else {
 		if ($checked) {
 			$output = WebGUI::Form::hidden({
-				name=>$name,
-				value=>$value
+				"name"=>$name,
+				"value"=>$value
 				});
 		}
 	}
@@ -235,22 +235,22 @@ sub checkList {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $options, $label, $value, $vertical, $extras, $subtext, $uiLevel) =
-                rearrange([name, options, label, value, vertical, extras, subtext, uiLevel], @p);
+                rearrange([qw(name options label value vertical extras subtext uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
 		$output = WebGUI::Form::checkList({
-			name=>$name,
-			options=>$options,
-			value=>$value,
-			vertical=>$vertical,
-			extras=>$extras
+			"name"=>$name,
+			"options"=>$options,
+			"value"=>$value,
+			"vertical"=>$vertical,
+			"extras"=>$extras
 			});
         	$output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
 	} else {
 		$output = WebGUI::Form::hiddenList({
-			name=>$name,
-			options=>$options,
-			value=>$value
+			"name"=>$name,
+			"options"=>$options,
+			"value"=>$value
 			});
 	}
         $self->{_data} .= $output;
@@ -315,23 +315,23 @@ sub combo {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $options, $label, $value, $size, $multiple, $extras, $subtext, $uiLevel) =
-                rearrange([name, options, label, value, size, multiple, extras, subtext, uiLevel], @p);
+                rearrange([qw(name options label value size multiple extras subtext uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::combo({
-                        name=>$name,
-			options=>$options,
-                        value=>$value,
-                        size=>$size,
-			multiple=>$multiple,
-                        extras=>$extras
+                        "name"=>$name,
+			"options"=>$options,
+                        "value"=>$value,
+                        "size"=>$size,
+			"multiple"=>$multiple,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hiddenList({
-			name=>$name,
-                        options=>$options,
-                        value=>$value
+			"name"=>$name,
+                        "options"=>$options,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -389,21 +389,21 @@ sub date {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $extras, $subtext, $size, $noDate, $uiLevel) =
-                rearrange([name, label, value, extras, subtext, size, noDate, uiLevel], @p);
+                rearrange([qw(name label value extras subtext size noDate uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::date({
-                        name=>$name,
-                        value=>$value,
-                        noDate=>$noDate,
-                        size=>$size,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "noDate"=>$noDate,
+                        "size"=>$size,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>epochToSet($value)
+                        "name"=>$name,
+                        "value"=>epochToSet($value)
                         });
         }
         $self->{_data} .= $output;
@@ -462,21 +462,21 @@ sub email {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $maxlength, $extras, $subtext, $size, $uiLevel) =
-                rearrange([name, label, value, maxlength, extras, subtext, size, uiLevel], @p);
+                rearrange([qw(name label value maxlength extras subtext size uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::email({
-                        name=>$name,
-                        value=>$value,
-                        maxlength=>$maxlength,
-                        size=>$size,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "maxlength"=>$maxlength,
+                        "size"=>$size,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -543,23 +543,23 @@ sub fieldType {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $types, $label, $value, $size, $multiple, $extras, $subtext, $uiLevel) =
-                rearrange([name, types, label, value, size, multiple, extras, subtext, uiLevel], @p);
+                rearrange([qw(name types label value size multiple extras subtext uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::fieldTypes({
-                        name=>$name,
-                        types=>$types,
-                        value=>$value,
-                        multiple=>$multiple,
-                        size=>$size,
-                        extras=>$extras
+                        "name"=>$name,
+                        "types"=>$types,
+                        "value"=>$value,
+                        "multiple"=>$multiple,
+                        "size"=>$size,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hiddenList({
-                        name=>$name,
+                        "name"=>$name,
                         types=>$types,
-                        value=>$value
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -608,12 +608,12 @@ sub file {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $subtext, $extras, $size, $uiLevel) =
-                rearrange([name, label, subtext, extras, size, uiLevel], @p);
+                rearrange([qw(name label subtext extras size uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::file({
-                        name=>$name,
-                        size=>$size,
-                        extras=>$extras
+                        "name"=>$name,
+                        "size"=>$size,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
@@ -674,23 +674,23 @@ sub group {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $size, $multiple, $extras, $subtext, $uiLevel) =
-                rearrange([name, label, value, size, multiple, extras, subtext, uiLevel], @p);
+                rearrange([qw(name label value size multiple extras subtext uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::group({
-                        name=>$name,
-                        size=>$size,
-                        value=>$value,
-                        multiple=>$multiple,
-                        extras=>$extras
+                        "name"=>$name,
+                        "size"=>$size,
+                        "value"=>$value,
+                        "multiple"=>$multiple,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
 		my $hashRef = WebGUI::SQL->quickHashRef("select groupId,groupName from groups");
                 $output = WebGUI::Form::hiddenList({
-			name=>$name,
-                        options=>$hashRef,
-                        value=>$value
+			"name"=>$name,
+                        "options"=>$hashRef,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -714,10 +714,10 @@ sub group {
 
 sub hidden {
         my ($self, @p) = @_;
-        my ($name, $value) = rearrange([name, value], @p);
+        my ($name, $value) = rearrange([qw(name value)], @p);
         $self->{_data} .= WebGUI::Form::hidden({
-		name=>$name,
-		value=>$value
+		"name"=>$name,
+		"value"=>$value
 		});
 }
 
@@ -781,22 +781,22 @@ sub HTMLArea {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $subtext, $extras, $wrap, $rows, $columns, $uiLevel) =
-                rearrange([name, label, value, subtext, extras, wrap, rows, columns, uiLevel], @p);
+                rearrange([qw(name label value subtext extras wrap rows columns uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::HTMLArea({
-                        name=>$name,
-                        value=>$value,
-                        wrap=>$wrap,
-                        columns=>$columns,
-                        rows=>$rows,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "wrap"=>$wrap,
+                        "columns"=>$columns,
+                        "rows"=>$rows,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -854,21 +854,21 @@ sub integer {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $maxlength, $extras, $subtext, $size, $uiLevel) =
-                rearrange([name, label, value, maxlength, extras, subtext, size, uiLevel], @p);
+                rearrange([qw(name label value maxlength extras subtext size uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::integer({
-                        name=>$name,
-                        value=>$value,
-                        maxlength=>$maxlength,
-                        size=>$size,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "maxlength"=>$maxlength,
+                        "size"=>$size,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -925,24 +925,24 @@ sub interval {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $intervalValue, $unitsValue, $extras, $subtext, $uiLevel) =
-                rearrange([name, label, intervalValue, unitsValue, extras, subtext, uiLevel], @p);
+                rearrange([qw(name label intervalValue unitsValue extras subtext uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::interval({
-                        name=>$name,
-                        intervalValue=>$intervalValue,
-                        unitsValue=>$unitsValue,
-                        extras=>$extras
+                        "name"=>$name,
+                        "intervalValue"=>$intervalValue,
+                        "unitsValue"=>$unitsValue,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name.'_interval',
-                        value=>$intervalValue
+                        "name"=>$name.'_interval',
+                        "value"=>$intervalValue
                         });
                 $output .= WebGUI::Form::hidden({
-                        name=>$name.'_units',
-                        value=>$unitsValue
+                        "name"=>$name.'_units',
+                        "value"=>$unitsValue
                         });
         }
         $self->{_data} .= $output;
@@ -976,7 +976,7 @@ sub interval {
  actions, or stylesheet information, you'd add it in here as
  follows:
 
-   'name="myForm" onChange="myForm.submit()"'
+   '"name"="myForm" onChange="myForm.submit()"'
 
 =item enctype 
 
@@ -989,22 +989,22 @@ sub interval {
  a name or stylesheet information, you'd add it in here as
  follows:
 
-   'name="myForm" class="formTable"'
+   '"name"="myForm" class="formTable"'
 
 
 =cut
 
 sub new {
-	my ($noTable, $header, $footer);
+	my ($header, $footer);
         my ($self, @p) = @_;
         my ($noTable, $action, $method, $extras, $enctype, $tableExtras) =
-                rearrange([noTable, action, method, extras, enctype, tableExtras], @p);
+                rearrange([qw(noTable action method extras enctype tableExtras)], @p);
 	$noTable = $noTable || 0;
 	$header = "\n\n".WebGUI::Form::formHeader({
-		action=>$action,
-		extras=>$extras,
-		method=>$method,
-		enctype=>$enctype
+		"action"=>$action,
+		"extras"=>$extras,
+		"method"=>$method,
+		"enctype"=>$enctype
 		});
 	$header .= "\n<table ".$tableExtras.'>' unless ($noTable);
 	$footer = "</table>\n" unless ($noTable);
@@ -1065,21 +1065,21 @@ sub password {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $subtext, $maxlength, $extras, $size, $uiLevel) =
-                rearrange([name, label, value, subtext, maxlength, extras, size, uiLevel], @p);
+                rearrange([qw(name label value subtext maxlength extras size uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::password({
-                        name=>$name,
-                        value=>$value,
-                        size=>$size,
-                        maxlength=>$maxlength,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "size"=>$size,
+                        "maxlength"=>$maxlength,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -1136,21 +1136,21 @@ sub phone {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $maxlength, $extras, $subtext, $size, $uiLevel) =
-                rearrange([name, label, value, maxlength, extras, subtext, size, uiLevel], @p);
+                rearrange([qw(name label value maxlength extras subtext size uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::phone({
-                        name=>$name,
-                        value=>$value,
-                        size=>$size,
-                        maxlength=>$maxlength,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "size"=>$size,
+                        "maxlength"=>$maxlength,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -1227,21 +1227,21 @@ sub radio {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $checked, $value, $subtext, $extras, $uiLevel) =
-                rearrange([name, label, checked, value, subtext, extras, uiLevel], @p);
+                rearrange([qw(name label checked value subtext extras uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::checkbox({
-                        name=>$name,
-                        value=>$value,
-                        checked=>$checked,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "checked"=>$checked,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
 		if ($checked) {
                 	$output = WebGUI::Form::hidden({
-                        	name=>$name,
-                        	value=>$value
+                        	"name"=>$name,
+                        	"value"=>$value
                         	});
 		}
         }
@@ -1300,22 +1300,22 @@ sub radioList {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $options, $label, $value, $vertical, $extras, $subtext, $uiLevel) =
-                rearrange([name, options, label, value, vertical, extras, subtext, uiLevel], @p);
+                rearrange([qw(name options label value vertical extras subtext uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::checkList({
-                        name=>$name,
-                        options=>$options,
-                        value=>$value,
-                        vertical=>$vertical,
-                        extras=>$extras
+                        "name"=>$name,
+                        "options"=>$options,
+                        "value"=>$value,
+                        "vertical"=>$vertical,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hiddenList({
-			name=>$name,
-                        options=>$options,
-                        value=>[$value]
+			"name"=>$name,
+                        "options"=>$options,
+                        "value"=>[$value]
                         });
         }
         $self->{_data} .= $output;
@@ -1338,7 +1338,7 @@ sub radioList {
 sub raw {
         my ($output);
         my ($self, @p) = @_;
-        my ($value, $uiLevel) = rearrange([value, uiLevel], @p);
+        my ($value, $uiLevel) = rearrange([qw(value uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
 		$self->{_data} .= $value;
         }
@@ -1377,7 +1377,7 @@ sub readOnly {
         my ($output);
         my ($self, @p) = @_;
         my ($value, $label, $subtext, $uiLevel) =
-                rearrange([value, label, subtext, uiLevel], @p);
+                rearrange([qw(value label subtext uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = $value;
                 $output .= _subtext($subtext);
@@ -1456,23 +1456,23 @@ sub selectList {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $options, $label, $value, $size, $multiple, $extras, $subtext, $uiLevel) =
-                rearrange([name, options, label, value, size, multiple, extras, subtext, uiLevel], @p);
+                rearrange([qw(name options label value size multiple extras subtext uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::selectList({
-                        name=>$name,
-                        options=>$options,
-                        value=>$value,
-                        multiple=>$multiple,
-                        size=>$size,
-                        extras=>$extras
+                        "name"=>$name,
+                        "options"=>$options,
+                        "value"=>$value,
+                        "multiple"=>$multiple,
+                        "size"=>$size,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hiddenList({
-			name=>$name,
-                        options=>$options,
-                        value=>$value
+			"name"=>$name,
+                        "options"=>$options,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -1510,10 +1510,10 @@ sub selectList {
 sub submit {
         my ($output);
         my ($self, @p) = @_;
-        my ($value, $label, $extras, $subtext) = rearrange([value, label, extras, subtext], @p);
+        my ($value, $label, $extras, $subtext) = rearrange([qw(value label extras subtext)], @p);
         $output = WebGUI::Form::submit({
-                value=>$value,
-                extras=>$extras
+                "value"=>$value,
+                "extras"=>$extras
                 });
         $output .= _subtext($subtext);
         $output = $self->_tableFormRow($label,$output);
@@ -1530,7 +1530,7 @@ sub template {
         my ($output, $subtext);
         my ($self, @p) = @_;
         my ($name, $value, $label, $namespace, $afterEdit, $extras, $uiLevel) = 
-		rearrange([name, value, label, namespace, afterEdit, extras, uiLevel], @p);
+		rearrange([qw(name value label namespace afterEdit extras uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
         	if ($afterEdit) {
                 	$subtext = '<a href="'.WebGUI::URL::page("op=editTemplate&tid=".$value."&namespace=".$namespace
@@ -1540,17 +1540,17 @@ sub template {
         	$subtext .= '<a href="'.WebGUI::URL::page("op=listTemplates&namespace=$namespace").'">'
 			.WebGUI::International::get(742).'</a>';
         	$output = WebGUI::Form::template({
-                	name=>$name,
-                	value=>$value,
-                	namespace=>$namespace,
-                	extras=>$extras
+                	"name"=>$name,
+                	"value"=>$value,
+                	"namespace"=>$namespace,
+                	"extras"=>$extras
                 	});
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -1607,21 +1607,21 @@ sub text {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $maxlength, $extras, $subtext, $size, $uiLevel) =
-                rearrange([name, label, value, maxlength, extras, subtext, size, uiLevel], @p);
+                rearrange([qw(name label value maxlength extras subtext size uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::text({
-                        name=>$name,
-                        value=>$value,
-                        size=>$size,
-                        maxlength=>$maxlength,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "size"=>$size,
+                        "maxlength"=>$maxlength,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
         	$output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -1684,22 +1684,22 @@ sub textarea {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $subtext, $extras, $wrap, $rows, $columns, $uiLevel) =
-                rearrange([name, label, value, subtext, extras, wrap, rows, columns, uiLevel], @p);
+                rearrange([qw(name label value subtext extras wrap rows columns uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::textarea({
-                        name=>$name,
-                        value=>$value,
-                        wrap=>$wrap,
-                        columns=>$columns,
-                        rows=>$rows,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "wrap"=>$wrap,
+                        "columns"=>$columns,
+                        "rows"=>$rows,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
         	$output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -1757,21 +1757,21 @@ sub url {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $maxlength, $extras, $subtext, $size, $uiLevel) =
-                rearrange([name, label, value, maxlength, extras, subtext, size, uiLevel], @p);
+                rearrange([qw(name label value maxlength extras subtext size uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::url({
-                        name=>$name,
-                        value=>$value,
-                        size=>$size,
-                        maxlength=>$maxlength,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "size"=>$size,
+                        "maxlength"=>$maxlength,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
         	$output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -1826,22 +1826,22 @@ sub whatNext {
         my ($output);
         my ($self, @p) = @_;
         my ($options, $value, $name, $label, $subtext, $uiLevel, $extras) =
-                rearrange([options, value, name, label, subtext, uiLevel, extras], @p);
+                rearrange([qw(options value name label subtext uiLevel extras)], @p);
 	$uiLevel |= 1;
 	$label |= WebGUI::International::get(744);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::whatNext({
-                        name=>$name,
-			options=>$options,
-                        value=>$value,
-                        extras=>$extras
+                        "name"=>$name,
+			"options"=>$options,
+                        "value"=>$value,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
                 $output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -1890,20 +1890,20 @@ sub yesNo {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $extras, $subtext, $uiLevel) =
-                rearrange([name, label, value, extras, subtext, uiLevel], @p);
+                rearrange([qw(name label value extras subtext uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::yesNo({
-                        name=>$name,
-                        value=>$value,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
         	$output = $self->_tableFormRow($label,$output);
         } else {
 		$value = 0 unless ($value);
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
@@ -1960,21 +1960,21 @@ sub zipcode {
         my ($output);
         my ($self, @p) = @_;
         my ($name, $label, $value, $maxlength, $extras, $subtext, $size, $uiLevel) =
-                rearrange([name, label, value, maxlength, extras, subtext, size, uiLevel], @p);
+                rearrange([qw(name label value maxlength extras subtext size uiLevel)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
                 $output = WebGUI::Form::zipcode({
-                        name=>$name,
-                        value=>$value,
-                        size=>$size,
-                        maxlength=>$maxlength,
-                        extras=>$extras
+                        "name"=>$name,
+                        "value"=>$value,
+                        "size"=>$size,
+                        "maxlength"=>$maxlength,
+                        "extras"=>$extras
                         });
                 $output .= _subtext($subtext);
         	$output = $self->_tableFormRow($label,$output);
         } else {
                 $output = WebGUI::Form::hidden({
-                        name=>$name,
-                        value=>$value
+                        "name"=>$name,
+                        "value"=>$value
                         });
         }
         $self->{_data} .= $output;
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 3497ac055..217187c5b 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -145,7 +145,7 @@ sub _loadWobjects {
 				$exclude = $session{config}{excludeWobject};
                         	$exclude =~ s/ //g;
 				next if (isIn($namespace, split(/,/,$exclude)));
-				$cmd = "\WebGUI::Wobject::".$namespace."::uiLevel";
+				$cmd = "WebGUI::Wobject::".$namespace."::uiLevel";
 				next if (eval($cmd) > $session{user}{uiLevel});	
 				$cmd = "\$WebGUI::Wobject::".$namespace."::name";
 				$session{wobject}{$namespace} = eval($cmd);
diff --git a/sbin/preload.perl b/sbin/preload.perl
index b210b2ece..9b6058e7a 100644
--- a/sbin/preload.perl
+++ b/sbin/preload.perl
@@ -52,6 +52,7 @@ use WebGUI::Attachment ();
 use WebGUI::DateTime ();
 #use WebGUI::Discussion (); # compile problems when this is included
 use WebGUI::ErrorHandler ();
+use WebGUI::Form ();
 use WebGUI::HTMLForm ();
 use WebGUI::HTML ();
 use WebGUI::Icon ();