diff --git a/e107_admin/meta.php b/e107_admin/meta.php
index 5f8f20e72..4b4aad6af 100644
--- a/e107_admin/meta.php
+++ b/e107_admin/meta.php
@@ -82,13 +82,13 @@ $text = "
 					<tr>
 						<td class='label'>".METLAN_9."</td>
 						<td class='control'>
-							<textarea class='tbox textarea' title='meta_description' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm($meta_diz[e_LANGUAGE])."</textarea>
+							<textarea class='tbox textarea e-autoheight' title='meta_description' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm($meta_diz[e_LANGUAGE])."</textarea>
 						</td>
 					</tr>
 					<tr>
 						<td class='label'>".METLAN_10."</td>
 						<td class='control'>
-							<textarea class='tbox textarea' title='meta_keywords' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm($meta_keywords[e_LANGUAGE])."</textarea>
+							<textarea class='tbox textarea e-autoheight' title='meta_keywords' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm($meta_keywords[e_LANGUAGE])."</textarea>
 						</td>
 					</tr>
 
@@ -109,7 +109,7 @@ $text = "
 					<tr>
 						<td class='label'>".METLAN_2."</td>
 						<td class='control'>
-							<textarea class='tbox textarea' title=\"eg. <meta name='author' content='your name' />\" id='meta' name='meta' cols='70'
+							<textarea class='tbox textarea e-autoheight' title=\"eg. <meta name='author' content='your name' />\" id='meta' name='meta' cols='70'
 							rows='10' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".str_replace("<","&lt;",$tp->toForm($meta[e_LANGUAGE]))."</textarea>
 							<div class='smalltext field-help'>eg. &lt;meta name='author' content='your name' /&gt; </div>
 						</td>
@@ -143,6 +143,7 @@ require_once("footer.php");
  */
 function headerjs()
 {
+	
 	$ret = "
 		<script type='text/javascript'>
 			var e107Admin = {}
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 35aea440f..2f9932d07 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -1172,7 +1172,7 @@ $text .= "
 		$text .= "
 					</tbody>
 			</table>
-			<table cellpadding='0' cellspacing='0' class='adminform' style='margin-top: 20px'>
+			<table class='adminform' style='margin-top: 20px'>
 				<colgroup>
 					<col class='col-label' />
 					<col class='col-control' />
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index fa300da88..ce79ea459 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -2168,14 +2168,14 @@ class e_admin_controller_ui extends e_admin_controller
 	 * db query building
 	 * @var array
 	 */
-	protected $tableJoin = array();
+	protected $tableJoin = array(); 
 
 	/**
 	 * Array of table names and their aliases. (detected from listQry)
 	 * db query building
 	 * @var array
 	 */
-	protected $joinAlias = array();
+	protected $joinAlias = array(); 
 
 	/**
 	 * Main model table alias
@@ -2237,6 +2237,11 @@ class e_admin_controller_ui extends e_admin_controller
 	 * @var integer
 	 */
 	protected $perPage = 20;
+	
+		/**
+	 * @var e_admin_model
+	 */
+	protected $formQuery = false; // custom form post query
 
 	/**
 	 * @var e_admin_model
@@ -2385,6 +2390,11 @@ class e_admin_controller_ui extends e_admin_controller
 	{
 		return $this->perPage;
 	}
+	
+	public function getFormQuery()
+	{
+		return $this->formQuery;
+	}
 
 	public function getPrimaryName()
 	{
@@ -4245,6 +4255,7 @@ class e_admin_form_ui extends e_form
 			'id' => $this->getElementId(), // unique string used for building element ids, REQUIRED
 			'pid' => $controller->getPrimaryName(), // primary field name, REQUIRED
 			//'url' => e_SELF, default
+			'query'	=> $controller->getFormQuery(), // work around - see form in newspost.php (submitted news)
 			//'query' => $request->buildQueryString(array(), true, 'ajax_used'), - ajax_used is now removed from QUERY_STRING - class2
 			'head_query' => $request->buildQueryString('field=[FIELD]&asc=[ASC]&from=[FROM]', false), // without field, asc and from vars, REQUIRED
 			'np_query' => $request->buildQueryString(array(), false, 'from'), // without from var, REQUIRED for next/prev functionality
diff --git a/e107_handlers/db_verify_class.php b/e107_handlers/db_verify_class.php
index a59b8970b..d0b6c1e28 100644
--- a/e107_handlers/db_verify_class.php
+++ b/e107_handlers/db_verify_class.php
@@ -362,8 +362,8 @@ class db_verify
 			<fieldset id='core-db-verify-{$selection}'>
 				<legend id='core-db-verify-{$selection}-legend'>".DBVLAN_16."</legend>
 
-				<table cellpadding='0' cellspacing='0' class='adminlist'>
-					<colgroup span='4'>
+				<table class='adminlist'>
+					<colgroup>
 						<col style='width: 25%'></col>
 						<col style='width: 25%'></col>
 						<col style='width: 10%'></col>
@@ -858,8 +858,8 @@ class db_verify
 		<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."' id='core-db-verify-sql-tables-form'>
 			<fieldset id='core-db-verify-sql-tables'>
 				<legend>".DBVLAN_14."</legend>
-				<table cellpadding='0' cellspacing='0' class='adminlist'>
-					<colgroup span='1'>
+				<table class='adminlist'>
+					<colgroup>
 						<col style='width: 100%'></col>
 					</colgroup>
 					<thead>
@@ -923,8 +923,8 @@ function check_tables($what)
 	{	// $k is the DB table name (less prefix)
 		$ttcount = 0;
 		$ttext = "
-				<table cellpadding='0' cellspacing='0' class='adminlist'>
-					<colgroup span='4'>
+				<table  class='adminlist'>
+					<colgroup >
 						<col style='width: 25%'></col>
 						<col style='width: 25%'></col>
 						<col style='width: 10%'></col>
@@ -1333,8 +1333,8 @@ $text = "
 	<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."' id='core-db-verify-sql-tables-form'>
 		<fieldset id='core-db-verify-sql-tables'>
 			<legend>".DBVLAN_14."</legend>
-			<table cellpadding='0' cellspacing='0' class='adminlist'>
-				<colgroup span='1'>
+			<table class='adminlist'>
+				<colgroup>
 					<col style='width: 100%'></col>
 				</colgroup>
 				<thead>
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index a09f60db9..8dd1da6f1 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -124,7 +124,7 @@ class e_form
     	// TODO - Hide the <input type='text'> element, and display the icon itself after it has been chosen.
 		// eg. <img id='iconview' src='".$img."' style='border:0; ".$blank_display."' alt='' />
 		// The button itself could be replaced with an icon just for this purpose.
-
+		return $this->imagepicker($name, $default, $label, 'media=_icon');
 
 		$e107 = e107::getInstance();
 		$id = $this->name2id($name);
@@ -226,20 +226,36 @@ class e_form
 				$default = $tp->createConstants($default, 'mix');
 			}
 			$default_url = $tp->replaceConstants($default, 'abs');
+			$blank = FALSE;
 		}
 		else
 		{
 			$default = $default_url = e_IMAGE_ABS."generic/blank.gif";
+			$blank = TRUE;
 		}
 		
 		//$width = intval(vartrue($sc_parameters['width'], 150));
-		
-		$ret = "<div class='imgselector-container'  style='display:block;width:120px;min-height:100px'>";
-		$att = 'aw=120&ah=100';
-		$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $tp->thumbUrl($default_thumb, $att, true);
-		$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='width:120px;height:100px;border:1px dashed black;' />";
-			
 		$cat = $tp->toDB($sc_parameters['media']);	
+		
+		if($cat == '_icon')
+		{
+			$ret = "<div class='imgselector-container'  style='display:block;width:64px;min-height:64px'>";
+			$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $default_thumb;
+			$style = ($blank) ? "border:1px dashed black;width:64px;height:64px" : "border:1px dashed black";
+			$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='{$style}' />";
+				
+		}
+		else
+		{
+			$ret = "<div class='imgselector-container'  style='display:block;width:120px;min-height:100px'>";
+			$att = 'aw=120&ah=100';
+			$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $tp->thumbUrl($default_thumb, $att, true);
+			$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='width:120px;height:100px;border:1px dashed black;' />";
+			
+		}
+		
+		
+		
 		$ret .= $this->mediaUrl($cat, $label,$name_id);
 		$ret .= "</div>\n";
 		$ret .=	"<input type='hidden' name='{$name}' id='{$name_id}' value='{$default}' />"; // to be hidden eventually. 
@@ -354,7 +370,7 @@ class e_form
 		{
 		   $cal_attrib['value'] = is_numeric($datestamp) ? e107::getDateConvert()->convert_date($datestamp, 'input') : $datestamp; //date("d/m/Y H:i:s", $datestamp);
 		}
-
+		
 		return $cal->make_input_field($cal_options, $cal_attrib);
 	}
 
@@ -1972,7 +1988,7 @@ class e_form
 		$text = '';
 		
 		
-		//print_a($form_options);
+		// print_a($form_options);
 		
 		foreach ($form_options as $fid => $options)
 		{
@@ -1992,7 +2008,6 @@ class e_form
 			$current_fields = varset($options['fieldpref']) ? $options['fieldpref'] : array_keys($options['fields']);
 			$legend_class = vartrue($options['legend_class'], 'e-hideme');
 
-
 	        $text .= "
 				<form method='post' action='{$formurl}' id='{$elid}-list-form'>
 				<div>".$this->token()."
@@ -2000,7 +2015,7 @@ class e_form
 					<fieldset id='{$elid}-list'>
 						<legend class='{$legend_class}'>".$options['legend']."</legend>
 						".vartrue($options['table_pre'])."
-						<table cellpadding='0' cellspacing='0' class='adminlist' id='{$elid}-list-table'>
+						<table class='adminlist' id='{$elid}-list-table'>
 							".$this->colGroup($fields, $current_fields)."
 							".$this->thead($fields, $current_fields, varset($options['head_query']), varset($options['query']))."
 							<tbody id='e-sort'>
@@ -2155,8 +2170,8 @@ class e_form
 			<fieldset id='{$id}'>
 				<legend>".vartrue($fdata['legend'])."</legend>
 				".vartrue($fdata['table_pre'])."
-				<table cellpadding='0' cellspacing='0' class='adminedit'>
-					<colgroup span='2'>
+				<table class='adminedit'>
+					<colgroup>
 						<col class='col-label' />
 						<col class='col-control' />
 					</colgroup>
@@ -2373,7 +2388,7 @@ class e_form
 		if(vartrue($fdata['table_rows']) || vartrue($fdata['table_body']))
 		{
 			$text .= "
-				<table cellpadding='0' cellspacing='0' class='adminform'>
+				<table class='adminform'>
 					{$colgroup}
 					<thead>
 						".vartrue($fdata['table_head'])."
diff --git a/e107_handlers/mailout_admin_class.php b/e107_handlers/mailout_admin_class.php
index 210b2f19c..d5529b15a 100644
--- a/e107_handlers/mailout_admin_class.php
+++ b/e107_handlers/mailout_admin_class.php
@@ -791,8 +791,8 @@ class mailoutAdminClass extends e107MailManager
 		$text .= "<div>
 			<form method='post' action='".e_SELF."?mode=makemail' id='mailout_form'>
 			".$this->emailSelector('all', varset($mailSource['mail_selectors'], FALSE))."
-			<table cellpadding='0' cellspacing='0' class='adminform'>
-			<colgroup span='2'>
+			<table class='adminform'>
+			<colgroup>
 				<col class='col-label' />
 				<col class='col-control' />
 			</colgroup>
@@ -1022,8 +1022,8 @@ class mailoutAdminClass extends e107MailManager
 		$text .= "
 			<form action='".e_SELF.'?mode=maildeleteconfirm&amp;m='.$mailID.'&amp;savepage='.$nextPage."' id='email_delete' method='post'>
 			<fieldset id='email-delete'>
-			<table cellpadding='0' cellspacing='0' class='adminlist'>
-			<colgroup span='2'>
+			<table class='adminlist'>
+			<colgroup>
 				<col class='col-label' />
 				<col class='col-control' />
 			</colgroup>
@@ -1093,7 +1093,7 @@ class mailoutAdminClass extends e107MailManager
 		$text .= "
 			<form action='".e_SELF.'?'.e_QUERY."' id='email_list' method='post'>
 			<fieldset id='emails-list'>
-			<table cellpadding='0' cellspacing='0' class='adminlist'>";
+			<table class='adminlist'>";
 
 		$fieldPrefs = $this->calcFieldSpec($type, TRUE);			// Get columns to display
 
@@ -1241,8 +1241,8 @@ class mailoutAdminClass extends e107MailManager
 		$text .= "
 			<form action='".e_SELF.'?mode=marksend&amp;m='.$mailMainID."' id='email_send' method='post'>
 			<fieldset id='email-send'>
-			<table cellpadding='0' cellspacing='0' class='adminlist'>
-			<colgroup span='2'>
+			<table class='adminlist'>
+			<colgroup>
 				<col class='col-label' />
 				<col class='col-control' />
 			</colgroup>
@@ -1304,8 +1304,8 @@ class mailoutAdminClass extends e107MailManager
 		$text = "
 			<legend>".LAN_MAILOUT_242."</legend>
 			<fieldset id='email-send-options'>
-			<table cellpadding='0' cellspacing='0' class='adminlist'>
-			<colgroup span='2'>
+			<table class='adminlist'>
+			<colgroup>
 				<col class='col-label' />
 				<col class='col-control' />
 			</colgroup>
@@ -1383,8 +1383,8 @@ class mailoutAdminClass extends e107MailManager
 		$text .= "
 			<form action='".e_SELF.'?'.e_QUERY."' id='email_recip_header' method='post'>
 			<fieldset id='email-recip_header'>
-			<table cellpadding='0' cellspacing='0' class='adminlist'>
-			<colgroup span='2'>
+			<table class='adminlist'>
+			<colgroup>
 				<col class='col-label' />
 				<col class='col-control' />
 			</colgroup>
@@ -1415,7 +1415,7 @@ class mailoutAdminClass extends e107MailManager
 			$text .= "
 				<form action='".e_SELF."?mode=recipients&amp;m={$mailID}&amp;count={$count}&amp;frm={$this->showFrom}&amp;fld={$this->sortField}&amp;asc={$this->sortOrder}&amp;savepage={$nextPage}' id='email_recip_body' method='post'>
 				<fieldset id='email-recip_body'>
-				<table cellpadding='0' cellspacing='0' class='adminlist'>";
+				<table class='adminlist'>";
 
 
 			$fieldPrefs = $this->calcFieldSpec('recipients', TRUE);			// Get columns to display
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index 93971e0ef..609bb4ede 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -291,6 +291,45 @@ class e_media
 		}
 		return $ret;	
 	}
+
+
+
+	/**
+	 * Return an array of Images in a particular category
+	 * @param string $type : 16 | 32 | 48 | 64
+	 * @param integer $from
+	 * @param integer $amount
+	 */
+	public function getIcons($type='', $from=0, $amount=null)
+	{
+		$inc = array();
+		
+		if($type)
+		{
+			$inc[] = "media_category = '_icon_".$type."' ";
+		}
+
+		$ret = array();
+		$query = "SELECT * FROM #core_media WHERE media_userclass IN (".USERCLASS_LIST.") AND media_category LIKE '_icon%' ";
+		$query .= (count($inc)) ? " AND ( ".implode(" OR ",$inc)." )" : "";
+		$query .= "  ORDER BY media_category, media_name";
+		
+		if($amount)
+		{
+			$query .= " LIMIT ".$from." ,".$amount;	
+		}
+		
+		e107::getDb()->db_Select_gen($query);
+		while($row = e107::getDb()->db_Fetch(mySQL_ASSOC))
+		{
+			$id = $row['media_id'];
+			$ret[$id] = $row;
+		}
+		return $ret;	
+	}
+	
+
+
 		
 	/**
 	 * Generate Simple Thumbnail window for image-selection 
@@ -336,39 +375,52 @@ class e_media
 	{
 		$bbcode = null; // option to override onclick behavior. See ibrowser.php 
 		
-		$cat = ($cat) ? $cat."+" : ""; // the '+' loads category '_common' as well as the chosen category. 
+		if($cat !='_icon')
+		{
+			$cat 	= ($cat) ? $cat."+" : ""; // the '+' loads category '_common' as well as the chosen category. 
+			$images = $this->getImages($cat,0,23);
+			$class 	= "media-select-image";
+			$w		= 120;
+			$h		= 100;
+		}
+		else // Icons
+		{
+			$cat 	= "";
+			$images = $this->getIcons($cat,0,200);
+			$class 	= "media-select-icon";
+			$w		= 64;
+			$h		= 64;
+		}
 		
 		parse_str($att); // grab 'onclick' . 
 		
 	//	$total_images 	= $this->getImages($cat); // for use by next/prev in filter at some point. 
-		$images 		= $this->getImages($cat,0,23);
+	
 		$att 			= 'aw=120&ah=100';		
 		$prevId 		= $tagid."_prev";
 		
 		// EXAMPLE of FILTER GUI. 
+	//	$text .= "CAT=".$cat;
 
 		$text .= "<div>Filter: <input type='text' name='non-working-filter-example' value='' />";
 		$text .= "<input type='button' value='Go' /> "; // Manual filter, if onkeyup ajax fails for some reason. 
 		$text .= "<input type='button' value='&laquo;' />"; // see previous page of images. 
 		$text .= "<input type='button' value='&raquo;' />"; // see next page of images. 
 		$text .= " Displaying 0-24 of 150 images.<br />&nbsp; </div>
-		<div>\n";
+		<div class='media-select-container'>\n";
 		
 		
 		if($bbcode == null) // e107 Media Manager - new-image mode. 
 		{
 			$onclick_clear = "parent.document.getElementById('{$tagid}').value = '';
 		 	parent.document.getElementById('".$prevId."').src = '".e_IMAGE_ABS."generic/blank.gif';
-		 	parent.e107Widgets.DialogManagerDefault.getWindow('e-dialog').close();
 		 	 return false;";
 			
-			$text .= "<a class='media-select-clear' style='float:left' href='#' onclick=\"{$onclick_clear}\" >
-			<div style='display:block;border:1px solid silver;padding-top:40px;text-align:center;vertical-align:middle;width:120px;height:58px'>
-			No Image</div>";		
+			$text .= "<a class='{$class} media-select-none e-dialog-close' style='vertical-align:middle;display:block;float:left;' href='#' onclick=\"{$onclick_clear}\" >
+			<div style='text-align:center;position: relative; top: 30%'>No image</div>
+			</a>";		
 		}
 
-		
-	
 		$srch = array("{MEDIA_URL}","{MEDIA_PATH}");
 		
 		foreach($images as $im)
@@ -393,16 +445,15 @@ class e_media
 				return false;";	
 			}
 		 	
+		 	$img_url = ($cat !='_icon') ? e107::getParser()->thumbUrl($im['media_url'], $att) : $media_path;
 			
-			$text .= "<a class='media-select e-dialog-close' title=\"".$diz."\" href='#' onclick=\"{$onclicki}\" >\n";
-			$text .= "<img src='".e107::getParser()->thumbUrl($im['media_url'], $att)."' alt=\"".$im['media_title']."\"  />\n";
+			$text .= "<a class='{$class} e-dialog-close' title=\"".$diz."\" style='float:left' href='#' onclick=\"{$onclicki}\" >";
+			$text .= "<img src='".$img_url."' alt=\"".$im['media_title']."\"  />";
 			$text .= "</a>\n\n";
 		}	
 		
 	
-		
-		
-		
+		$text .= "<div style='clear:both'><!-- --></div>";
 		$text .= "</div>";
 				
 		return $text;	
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index 68052137d..c64553bf5 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -470,7 +470,7 @@ class e_menuManager {
 		<form  method='post' action='".e_SELF."?lay=".$this->curLayout."'>
         <fieldset id='core-menus-parametersform'>
 		<legend>Menu parameters ".$row['menu_name']."</legend>
-        <table cellpadding='0' cellspacing='0' class='adminform'>
+        <table class='adminform'>
 		<tr>
 		<td>
 		Parameters (query string format):
@@ -511,7 +511,7 @@ class e_menuManager {
 		<form  method='post' action='".e_SELF."?lay=".$this->curLayout."'>
         <fieldset id='core-menus-visibilityform'>
 		<legend>". MENLAN_7." ".$row['menu_name']."</legend>
-        <table cellpadding='0' cellspacing='0' class='adminform'>
+        <table class='adminform'>
 		<tr>
 		<td>
 		<input type='hidden' name='menuAct[{$row['menu_id']}]' value='sv.{$row['menu_id']}' />
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index fea5a6d94..8a2acd608 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -477,8 +477,8 @@ class themeHandler
 			
 			$text = "
 			  	<div style='text-align:center'>
-				<table cellpadding='0' cellspacing='0' class='adminform'>
-					<colgroup span='2'>
+				<table class='adminform'>
+					<colgroup>
 						<col class='col-label' />
 						<col class='col-control' />
 					</colgroup>
@@ -522,7 +522,7 @@ class themeHandler
 
 		
 		$text = "<div style='font-weight:bold;margin-bottom:10px'>".TPVLAN_7."</div>
-			<table class='adminlist' cellpadding='0' cellspacing='0'>";
+			<table class='adminlist'>";
 		$text .= $author ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_4."</b>:</td><td style='vertical-align:top'>".$author."</td></tr>" : "";
 		$text .= $website ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_5."</b>:</td><td style='vertical-align:top'>".$website."</td></tr>" : "";
 		$text .= $theme['date'] ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_6."</b>:</td><td style='vertical-align:top'>".$theme['date']."</td></tr>" : "";
@@ -715,7 +715,7 @@ class themeHandler
 		
 		$text .= "
 		<div id='core-thememanager-configure'>
-        <table cellpadding='0' cellspacing='0' class='adminform'>
+        <table class='adminform'>
         	<colgroup>
         		<col class='col-label' />
         		<col class='col-control' />
@@ -777,8 +777,8 @@ class themeHandler
 			$itext = "<tr>
 					<td style='vertical-align:top; width:24%'><b>".TPVLAN_50."</b>:</td>
 					<td colspan='2' style='vertical-align:top'>
-                    <table cellpadding='0' cellspacing='0' class='adminlist'>
-                      	<colgroup span='2'>
+                    <table class='adminlist'>
+                      	<colgroup>
                       		<col class='col-tm-layout-default' style='width:10%' />
                       		<col class='col-tm-layout-name' style='width:20%' />
 							<col class='col-tm-layout-visibility' style='width:35%' />
diff --git a/e107_plugins/calendar_menu/admin_config.php b/e107_plugins/calendar_menu/admin_config.php
index 88297b062..eb692ad1f 100644
--- a/e107_plugins/calendar_menu/admin_config.php
+++ b/e107_plugins/calendar_menu/admin_config.php
@@ -454,7 +454,7 @@ if($action == 'cat')
 			$calendarmenu_text .= "
 			<form id='calformupdate' method='post' action='".e_SELF."?cat'>
 			<fieldset id='plugin-ecal-categories'>
-				<table cellpadding='0' cellspacing='0' class='adminform'>
+				<table class='adminform'>
 			<colgroup span='2'>
 				<col style = 'width:20%;' class='col-label' />
 				<col style = 'width:80%;' class='col-control' />
diff --git a/e107_plugins/import/admin_import.php b/e107_plugins/import/admin_import.php
index 32886f1a0..6818e0a92 100644
--- a/e107_plugins/import/admin_import.php
+++ b/e107_plugins/import/admin_import.php
@@ -387,8 +387,8 @@ function showStartPage()
 	<form method='post' action='".e_SELF."' id='core-import-form'>
 		<fieldset id='core-import-select-type'>
 		<legend class='e-hideme'>".'DBLAN_10'."</legend>
-            <table cellpadding='0' cellspacing='0' class='adminlist'>
-			<colgroup span='2'>
+            <table class='adminlist'>
+			<colgroup>
 			<col />
 			<col />
 			<col />
@@ -463,8 +463,8 @@ function showImportOptions($mode='csv')
 
 	$text = "
 	<form method='post' action='".e_SELF."'>
-    <table cellpadding='0' cellspacing='0' class='adminform'>
-    	<colgroup span='2'>
+    <table class='adminform'>
+    	<colgroup>
     		<col class='col-label' />
     		<col class='col-control' />
     	</colgroup>";
diff --git a/e107_plugins/tinymce/admin_config.php b/e107_plugins/tinymce/admin_config.php
index 95573cb66..63a4b880d 100644
--- a/e107_plugins/tinymce/admin_config.php
+++ b/e107_plugins/tinymce/admin_config.php
@@ -146,7 +146,7 @@ class tinymce
         $text = "<form method='post' action='".e_SELF."?mode=create'>
                         <fieldset id='core-release-list'>
 						<legend class='e-hideme'>".$this->pluginTitle."</legend>
-						<table cellpadding='0' cellspacing='0' class='adminlist'>".
+						<table class='adminlist'>".
 							$frm->colGroup($this->fields,$this->fieldpref).
 							$frm->thead($this->fields,$this->fieldpref).
 
@@ -280,8 +280,8 @@ class tinymce
 			<form method='post' action='".e_SELF."?mode=create' id='dataform' enctype='multipart/form-data'>
 				<fieldset id='core-cpage-create-general'>
 					<legend class='e-hideme'>".$this->pluginTitle."</legend>
-					<table cellpadding='0' cellspacing='0' class='adminedit'>
-						<colgroup span='2'>
+					<table class='adminedit'>
+						<colgroup>
 							<col class='col-label' />
 							<col class='col-control' />
 						</colgroup>
@@ -450,8 +450,8 @@ class tinymce
 			<form method='post' action='".e_SELF."?".e_QUERY."'>
 				<fieldset id='core-cpage-options'>
 					<legend class='e-hideme'>".LAN_OPTIONS."</legend>
-					<table cellpadding='0' cellspacing='0' class='adminform'>
-						<colgroup span='2'>
+					<table class='adminform'>
+						<colgroup>
 							<col class='col-label' />
 							<col class='col-control' />
 						</colgroup>
@@ -611,8 +611,8 @@ function edit_theme()
  $text = "<div style='text-align:center'>
     <form method='post' action='".e_SELF."'>
 	<fieldset id='plugin-tinymce-config'>
-     <table cellpadding='0' cellspacing='0' class='adminform'>
-     	<colgroup span='2'>
+     <table class='adminform'>
+     	<colgroup>
      		<col class='col-label' />
      		<col class='col-control' />
      	</colgroup>
diff --git a/e107_themes/_blank/admin_template.php b/e107_themes/_blank/admin_template.php
index b5ad2f6d6..4f51abe6a 100644
--- a/e107_themes/_blank/admin_template.php
+++ b/e107_themes/_blank/admin_template.php
@@ -43,7 +43,7 @@ $ADMIN_HEADER = "
 		</div>
 	</div>
 	<div class='admin-page-body'>
-		<table class='main-table' cellpadding='0' cellspacing='0'>
+		<table class='main-table'>
 			<tr>
 				<!--
 				<td class='col-left'></td>
diff --git a/e107_themes/jayya/admin_theme.php b/e107_themes/jayya/admin_theme.php
index 33409acaf..48470eea6 100644
--- a/e107_themes/jayya/admin_theme.php
+++ b/e107_themes/jayya/admin_theme.php
@@ -107,7 +107,8 @@ e107::js('inline','
     	 $(".e-expandit").show();
     			
        	$(".e-expandit").click(function () {
-			$(".e-hideme").toggle("slow");
+       		var id = $(this).attr("href");
+			$(id).toggle("slow");
 		}); 
 		
 		// Date
@@ -127,13 +128,14 @@ e107::js('inline','
   		$(".adminlist tr:last").addClass("last");
 				
 		// Character Counter
-		$("textarea").before("<p id=\"remainingCharacters\">&nbsp;</p>");
+		$("textarea").before("<p class=\"remainingCharacters\" id=\"" + $("textarea").attr("name")+ "-remainingCharacters\">&nbsp;</p>");
 		$("textarea").keyup(function(){
     		
     	//	var max=$(this).attr("maxlength");
 			var max = 100;
+			var el = "#" + $(this).attr("name") + "-remainingCharacters";
     		var valLen=$(this).val().length;
-    		$("#remainingCharacters").text( valLen + " characters")
+    		$(el).text( valLen + " characters")
 		});
 		
 		// Text-area AutoGrow
@@ -151,6 +153,18 @@ e107::js('inline','
 			parent.$.colorbox.close()
 		}); 
 		
+		
+		// Modal Box - uses inline hidden content 
+		$(".e-modal").click(function () {
+			var id = $(this).attr("href");
+			$(id).dialog({
+				 minWidth: 800,
+				 maxHeight: 800,
+				 modal: true
+			 });
+		});
+		
+		
 		// Sorting
 		var fixHelper = function(e, ui) {
 			ui.children().each(function() {
@@ -192,6 +206,24 @@ e107::js('inline','
 			}
 		});
 		
+		// highlight checked row
+		$("input[type=\"checkbox\"].checkbox").click(function(evt){
+	
+			if(this.checked)
+			{
+				$(this).closest("tr").switchClass( "odd", "highlight-odd", 0 );
+				$(this).closest("tr").switchClass( "even", "highlight-even", 0 );
+    		}
+			else
+			{
+				$(this).closest("tr").switchClass( "highlight-even", "even", 300 );
+				$(this).closest("tr").switchClass( "highlight-odd", "odd", 300 );
+			}	
+			
+		});
+		
+			
+		
 	
 		// Basic Delete Confirmation	
 		$("input.delete").click(function(){
@@ -199,14 +231,27 @@ e107::js('inline','
   			return answer // answer is a boolean
 		});  
 		
+		
+		
 
 		
 		
 })
+		// BC Expandit() function 
+		function expandit(e) {
+			var id = "#" + e; // TODO detect new "div" when e = ""; 
+			$(id).toggle("slow");
+			
+		};
+		
+		
+		
 ','jquery');
 
 e107::css('inline',"
 	.e-moving { background-color:yellow; }
+	tr.highlight-even	{ background-color:silver; }
+	tr.highlight-odd	{ background-color:silver; }
 	legend { display: none; }
 ",'jquery');
 
diff --git a/e107_themes/jayya/style.css b/e107_themes/jayya/style.css
index ea8d971d7..ad4ba01f4 100644
--- a/e107_themes/jayya/style.css
+++ b/e107_themes/jayya/style.css
@@ -826,3 +826,10 @@ h3 {  font-size: 12px; }
 h1.bbcode, h2.bbcode, h3.bbcode, h4.bbcode, h5.bbcode, h6.bbcode {  }/* override if requried */
 
 div.bbcode { margin: 15px 0px; clear: both; } /* layout control via bbcodes */
+
+a.media-select-image 		{ margin:5px; border:1px solid silver; }
+a.media-select-image:hover	{ border:1px solid red; }
+a.media-select-icon			{ text-align:center; vertical-align:middle; margin:1px; border:1px solid white; width:48px; height:48px;}
+a.media-select-icon:hover	{ border:1px solid red; }
+.media-select-container 	{ padding:10px; }
+.media-select-none			{ text-decoration:none; }