From 6c66636dc547791c5a61d52625e00f50eb238e89 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 31 May 2017 18:16:10 +0100
Subject: [PATCH] [codestyle] admin components xml files (#15920)

* codestyle

* code style

* codestyle

* codestyle

* codestyle

* thanks @wojsmol

* corrections - thanks @quy

* corrections - thanks @quy

* oops

* make @quy happy

* Update article.xml

* Remove space

* Update config.xml (#14)

* Update filter.xml (#15)

* Update config.xml (#16)

* Update profile.xml (#17)

* Update application.xml (#18)

* Update article.xml (#19)

* Update filter_articles.xml (#20)

* Update config.xml (#24)

* Update config.xml (#23)

* Update filter_fields.xml (#22)

* Update filter_featured.xml (#21)

* Update override.xml (#25)

* Update config.xml

* Update config.xml (#26)

* Update itemadmin_alias.xml (#30)

* Update itemadmin.xml (#29)

* Update item.xml (#27)

* Update item_alias.xml (#28)

* Update itemadmin_url.xml (#31)

* Update module.xml (#32)

* Update plugin.xml (#33)

* Update config.xml (#34)

* Update link.xml (#35)

* Update config.xml (#36)

* Update style.xml (#38)

* Update config.xml (#37)

* Update note.xml (#42)

* Update group.xml (#41)

* Update filter_debuggroup.xml (#40)

* Update config.xml (#39)

* corrections for @andrepereiradasilva

* gotya
---
 .../com_admin/models/forms/profile.xml        |  97 ++-
 .../models/forms/association.xml              |   2 +-
 .../models/forms/filter_associations.xml      |  18 +-
 .../com_banners/models/forms/download.xml     |   2 +-
 .../views/category/tmpl/edit.xml              |   2 +-
 .../com_config/model/form/application.xml     | 160 +++--
 .../com_contact/models/forms/contact.xml      |   6 +-
 .../components/com_content/config.xml         | 636 ++++++++++--------
 .../com_content/models/forms/article.xml      | 605 +++++++++++------
 .../models/forms/filter_articles.xml          |  59 +-
 .../models/forms/filter_featured.xml          |  61 +-
 .../com_fields/models/forms/field.xml         |  51 +-
 .../com_fields/models/forms/filter_fields.xml |  13 +-
 .../com_fields/models/forms/group.xml         |  12 +-
 .../components/com_finder/config.xml          | 179 +++--
 .../com_finder/models/forms/filter.xml        | 121 +++-
 .../models/forms/filter_filters.xml           |   5 +-
 .../com_finder/models/forms/filter_index.xml  |   5 +
 .../com_finder/models/forms/filter_maps.xml   |   7 +-
 .../models/forms/filter_discover.xml          |   5 +
 .../models/forms/filter_languages.xml         |   1 +
 .../models/forms/filter_manage.xml            |   6 +
 .../components/com_languages/config.xml       |   4 +-
 .../com_languages/models/forms/language.xml   |  78 ++-
 .../com_languages/models/forms/override.xml   |  30 +-
 administrator/components/com_media/config.xml |  58 +-
 .../com_menus/models/forms/filter_items.xml   |   2 +-
 .../models/forms/filter_itemsadmin.xml        |   3 +-
 .../com_menus/models/forms/filter_menus.xml   |   2 +-
 .../com_menus/models/forms/item.xml           |  85 +--
 .../com_menus/models/forms/item_alias.xml     |  41 +-
 .../com_menus/models/forms/item_component.xml | 106 +--
 .../com_menus/models/forms/item_heading.xml   |  35 +-
 .../com_menus/models/forms/item_separator.xml |  28 +-
 .../com_menus/models/forms/item_url.xml       |  45 +-
 .../com_menus/models/forms/itemadmin.xml      |  21 +-
 .../models/forms/itemadmin_alias.xml          |  14 +-
 .../models/forms/itemadmin_component.xml      |  35 +-
 .../models/forms/itemadmin_container.xml      |   8 +-
 .../models/forms/itemadmin_heading.xml        |   8 +-
 .../com_menus/models/forms/itemadmin_url.xml  |  42 +-
 .../com_menus/models/forms/menu.xml           |  16 +-
 .../com_menus/views/item/tmpl/edit.xml        |   2 +-
 .../com_menus/views/items/tmpl/default.xml    |   2 +-
 .../components/com_messages/config.xml        |   3 +-
 .../com_messages/models/forms/config.xml      |  27 +-
 .../com_messages/models/forms/message.xml     |   9 +-
 .../com_modules/models/forms/advanced.xml     |   6 +-
 .../com_modules/models/forms/module.xml       | 104 ++-
 .../com_plugins/models/forms/plugin.xml       |  42 +-
 .../components/com_postinstall/config.xml     |   3 +-
 .../components/com_redirect/config.xml        |  15 +-
 .../com_redirect/models/forms/link.xml        |  59 +-
 administrator/components/com_tags/config.xml  | 206 +++---
 .../components/com_tags/models/forms/tag.xml  |  57 +-
 .../components/com_templates/config.xml       |  26 +-
 .../com_templates/models/forms/source.xml     |  13 +-
 .../com_templates/models/forms/style.xml      |  25 +-
 .../models/forms/style_administrator.xml      |   3 +-
 .../com_templates/models/forms/style_site.xml |   3 +-
 administrator/components/com_users/config.xml | 128 ++--
 .../models/forms/filter_debuggroup.xml        |   5 +
 .../com_users/models/forms/filter_users.xml   |  16 +-
 .../com_users/models/forms/group.xml          |  31 +-
 .../com_users/models/forms/level.xml          |  24 +-
 .../com_users/models/forms/mail.xml           |  52 +-
 .../com_users/models/forms/note.xml           |  59 +-
 .../com_users/models/forms/user.xml           | 142 ++--
 68 files changed, 2257 insertions(+), 1519 deletions(-)

diff --git a/administrator/components/com_admin/models/forms/profile.xml b/administrator/components/com_admin/models/forms/profile.xml
index ca772b2e257fb..f665004d4fbe7 100644
--- a/administrator/components/com_admin/models/forms/profile.xml
+++ b/administrator/components/com_admin/models/forms/profile.xml
@@ -1,46 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset name="user_details">
-		<field name="name" type="text"
-			description="COM_ADMIN_USER_FIELD_NAME_DESC"
+		<field 
+			name="name" 
+			type="text"
 			label="COM_ADMIN_USER_HEADING_NAME"
+			description="COM_ADMIN_USER_FIELD_NAME_DESC"
 			required="true"
 			size="30"
 		/>
 
-		<field name="username" type="text"
-			description="COM_ADMIN_USER_FIELD_USERNAME_DESC"
+		<field 
+			name="username" 
+			type="text"
 			label="COM_ADMIN_USER_FIELD_USERNAME_LABEL"
+			description="COM_ADMIN_USER_FIELD_USERNAME_DESC"
 			required="true"
 			size="30"
 		/>
 
-		<field name="password2" type="password"
+		<field 
+			name="password2" 
+			type="password"
+			label="JGLOBAL_PASSWORD"
+			description="COM_ADMIN_USER_FIELD_PASSWORD_DESC"
 			autocomplete="off"
 			class="validate-password"
-			description="COM_ADMIN_USER_FIELD_PASSWORD_DESC"
 			field="password"
 			filter="raw"
-			label="JGLOBAL_PASSWORD"
 			message="COM_ADMIN_USER_FIELD_PASSWORD1_MESSAGE"
 			size="30"
 			validate="equals"
 		/>
 
-		<field name="password" type="password"
+		<field 
+			name="password" 
+			type="password"
+			label="COM_ADMIN_USER_FIELD_PASSWORD2_LABEL"
+			description="COM_ADMIN_USER_FIELD_PASSWORD2_DESC"
 			autocomplete="off"
 			class="validate-password"
-			description="COM_ADMIN_USER_FIELD_PASSWORD2_DESC"
 			filter="raw"
-			label="COM_ADMIN_USER_FIELD_PASSWORD2_LABEL"
 			size="30"
 			validate="password"
 		/>
 
-		<field name="email" type="email"
-			class="validate-email"
-			description="COM_ADMIN_USER_FIELD_EMAIL_DESC"
+		<field 
+			name="email" 
+			type="email"
 			label="JGLOBAL_EMAIL"
+			description="COM_ADMIN_USER_FIELD_EMAIL_DESC"
+			class="validate-email"
 			required="true"
 			size="30"
 			validate="email"
@@ -49,9 +59,9 @@
 		<field
 			name="registerDate"
 			type="calendar"
-			class="readonly"
 			label="COM_ADMIN_USER_FIELD_REGISTERDATE_LABEL"
 			description="COM_ADMIN_USER_FIELD_REGISTERDATE_DESC"
+			class="readonly"
 			readonly="true"
 			translateformat="true"
 			showtime="true"
@@ -62,9 +72,9 @@
 		<field
 			name="lastvisitDate"
 			type="calendar"
-			class="readonly"
 			label="COM_ADMIN_USER_FIELD_LASTVISIT_LABEL"
 			description="COM_ADMIN_USER_FIELD_LASTVISIT_DESC"
+			class="readonly"
 			readonly="true"
 			translateformat="true"
 			showtime="true"
@@ -75,13 +85,13 @@
 		<field
 			name="id"
 			type="text"
-			class="readonly"
 			label="JGLOBAL_FIELD_ID_LABEL"
-			description ="JGLOBAL_FIELD_ID_DESC"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
 			default="0"
 			readonly="true"
 			filter="unset"
-			/>
+		/>
 
 	</fieldset>
 
@@ -90,48 +100,61 @@
 		<!--  Basic user account settings. -->
 		<fieldset name="settings" label="COM_ADMIN_USER_SETTINGS_FIELDSET_LABEL">
 
-			<field name="admin_style" type="templatestyle"
-				client="administrator"
-				description="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC"
+			<field 
+				name="admin_style" 
+				type="templatestyle"
 				label="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC"
+				client="administrator"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="admin_language" type="language"
-				client="administrator"
-				description="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_DESC"
+			<field 
+				name="admin_language" 
+				type="language"
 				label="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_DESC"
+				client="administrator"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="language" type="language"
-				client="site"
-				description="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+			<field 
+				name="language"
+				type="language"
 				label="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+				client="site"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="editor" type="plugins" folder="editors"
-				description="COM_ADMIN_USER_FIELD_EDITOR_DESC"
+			<field 
+				name="editor" 
+				type="plugins" 
 				label="COM_ADMIN_USER_FIELD_EDITOR_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_EDITOR_DESC"
+				folder="editors"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="helpsite" type="helpsite"
+			<field 
+				name="helpsite" 
+				type="helpsite"
 				label="COM_ADMIN_USER_FIELD_HELPSITE_LABEL"
 				description="COM_ADMIN_USER_FIELD_HELPSITE_DESC"
-			>
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="timezone" type="timezone"
+			<field 
+				name="timezone" 
+				type="timezone"
 				label="COM_ADMIN_USER_FIELD_TIMEZONE_LABEL"
 				description="COM_ADMIN_USER_FIELD_TIMEZONE_DESC"
-			>
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 		</fieldset>
diff --git a/administrator/components/com_associations/models/forms/association.xml b/administrator/components/com_associations/models/forms/association.xml
index 89add5542b210..9e8d880e22984 100644
--- a/administrator/components/com_associations/models/forms/association.xml
+++ b/administrator/components/com_associations/models/forms/association.xml
@@ -6,7 +6,7 @@
 			type="itemlanguage"
 			label="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_LABEL"
 			description="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_DESC"
-		>
+			>
 			<option value="">COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE</option>
 		</field>
 
diff --git a/administrator/components/com_associations/models/forms/filter_associations.xml b/administrator/components/com_associations/models/forms/filter_associations.xml
index c44a3804fd005..9563de4489650 100644
--- a/administrator/components/com_associations/models/forms/filter_associations.xml
+++ b/administrator/components/com_associations/models/forms/filter_associations.xml
@@ -7,7 +7,7 @@
 		description="COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC"
 		filtermode="selector"
 		onchange="jQuery('select[id^=\'filter_\']').val('');jQuery('select[id^=\'list_\']').val('');this.form.submit();"
-	>
+		>
 		<option value="">COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE</option>
 	</field>
 
@@ -15,10 +15,10 @@
 		name="language"
 		type="contentlanguage"
 		label="JOPTION_FILTER_LANGUAGE"
-		filtermode="selector"
 		description="JOPTION_FILTER_LANGUAGE_DESC"
+		filtermode="selector"
 		onchange="this.form.submit();"
-	>
+		>
 		<option value="">JOPTION_SELECT_LANGUAGE</option>
 	</field>
 
@@ -37,7 +37,7 @@
 			label="JOPTION_FILTER_PUBLISHED"
 			description="JOPTION_FILTER_PUBLISHED_DESC"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 
@@ -49,7 +49,7 @@
 			published="0,1,2"
 			extension="dynamic"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_CATEGORY</option>
 		</field>
 
@@ -60,7 +60,7 @@
 			description="COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC"
 			clientid="0"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">COM_ASSOCIATIONS_SELECT_MENU</option>
 		</field>
 
@@ -70,7 +70,7 @@
 			label="JOPTION_FILTER_ACCESS"
 			description="JOPTION_FILTER_ACCESS_DESC"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
 
@@ -83,7 +83,7 @@
 			last="10"
 			step="1"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
 	</fields>
@@ -94,7 +94,7 @@
 			type="list"
 			default="id ASC"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="state ASC">JSTATUS_ASC</option>
 			<option value="state DESC">JSTATUS_DESC</option>
diff --git a/administrator/components/com_banners/models/forms/download.xml b/administrator/components/com_banners/models/forms/download.xml
index 0c90b70bc95d4..17c0cc6ec96de 100644
--- a/administrator/components/com_banners/models/forms/download.xml
+++ b/administrator/components/com_banners/models/forms/download.xml
@@ -18,8 +18,8 @@
 		<field
 			name="basename"
 			type="text"
-			size="40"
 			label="COM_BANNERS_FIELD_BASENAME_LABEL"
+			size="40"
 		/>
 
 		<field
diff --git a/administrator/components/com_categories/views/category/tmpl/edit.xml b/administrator/components/com_categories/views/category/tmpl/edit.xml
index 11d01e0cf8540..f96948e4ad153 100755
--- a/administrator/components/com_categories/views/category/tmpl/edit.xml
+++ b/administrator/components/com_categories/views/category/tmpl/edit.xml
@@ -13,7 +13,7 @@
 				label="COM_CATEGORIES_CHOOSE_COMPONENT_LABEL"
 				description="COM_CATEGORIES_CHOOSE_COMPONENT_DESC"
 				required="true"
-			>
+				>
 				<option value="">COM_MENUS_OPTION_SELECT_COMPONENT</option>
 			</field>
 			<field
diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
index a620e7993fa9b..8fda9c7e445fa 100644
--- a/administrator/components/com_config/model/form/application.xml
+++ b/administrator/components/com_config/model/form/application.xml
@@ -7,9 +7,9 @@
 		<field
 			name="cache_handler"
 			type="cachehandler"
-			default=""
 			label="COM_CONFIG_FIELD_CACHE_HANDLER_LABEL"
 			description="COM_CONFIG_FIELD_CACHE_HANDLER_DESC"
+			default=""
 			filter="word"
 		/>
 
@@ -32,7 +32,7 @@
 			default="1"
 			showon="cache_handler:memcache"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -46,7 +46,7 @@
 			default="0"
 			showon="cache_handler:memcache"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -85,7 +85,7 @@
 			default="1"
 			showon="cache_handler:memcached"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -99,7 +99,7 @@
 			default="0"
 			showon="cache_handler:memcached"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -138,7 +138,7 @@
 			default="1"
 			filter="integer"
 			showon="cache_handler:redis"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -211,7 +211,7 @@
 			class="btn-group btn-group-yesno"
 			default="0"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -223,7 +223,7 @@
 			description="COM_CONFIG_FIELD_CACHE_DESC"
 			default="2"
 			filter="integer"
-		>
+			>
 			<option value="0">COM_CONFIG_FIELD_VALUE_CACHE_OFF</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE</option>
 			<option value="2">COM_CONFIG_FIELD_VALUE_CACHE_PROGRESSIVE</option>
@@ -282,9 +282,9 @@
 		<field
 			name="dbprefix"
 			type="text"
-			default="jos_"
 			label="COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL"
 			description="COM_CONFIG_FIELD_DATABASE_PREFIX_DESC"
+			default="jos_"
 			filter="string"
 			size="10"
 		/>
@@ -298,12 +298,12 @@
 		<field
 			name="debug"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL"
 			description="COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -311,31 +311,29 @@
 		<field
 			name="debug_lang"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_DEBUG_LANG_LABEL"
 			description="COM_CONFIG_FIELD_DEBUG_LANG_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 
 	</fieldset>
 
-	<fieldset
-		name="ftp"
-		label="CONFIG_FTP_SETTINGS_LABEL">
+	<fieldset name="ftp" label="CONFIG_FTP_SETTINGS_LABEL">
 
 		<field
 			name="ftp_enable"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_FTP_ENABLE_LABEL"
 			description="COM_CONFIG_FIELD_FTP_ENABLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -390,8 +388,8 @@
 			name="ftp_root"
 			type="text"
 			label="COM_CONFIG_FIELD_FTP_ROOT_LABEL"
-			showon="ftp_enable:1"
 			description="COM_CONFIG_FIELD_FTP_ROOT_DESC"
+			showon="ftp_enable:1"
 			filter="string"
 			size="50"
 		/>
@@ -405,12 +403,12 @@
 		<field
 			name="proxy_enable"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_PROXY_ENABLE_LABEL"
 			description="COM_CONFIG_FIELD_PROXY_ENABLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -470,10 +468,10 @@
 		<field
 			name="offset"
 			type="timezone"
-			default="UTC"
 			label="COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL"
 			description="COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC"
-		>
+			default="UTC"
+			>
 			<option value="UTC">JLIB_FORM_VALUE_TIMEZONE_UTC</option>
 		</field>
 
@@ -491,7 +489,7 @@
 			class="btn-group btn-group-yesno"
 			default="1"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -505,7 +503,7 @@
 			default="0"
 			filter="integer"
 			showon="mailonline:1"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -560,7 +558,7 @@
 			default="mail"
 			filter="word"
 			showon="mailonline:1"
-		>
+			>
 			<option value="mail">COM_CONFIG_FIELD_VALUE_PHP_MAIL</option>
 			<option value="sendmail">COM_CONFIG_FIELD_VALUE_SENDMAIL</option>
 			<option value="smtp">COM_CONFIG_FIELD_VALUE_SMTP</option>
@@ -612,7 +610,7 @@
 			default="none"
 			showon="mailonline:1[AND]mailer:smtp"
 			filter="word"
-		>
+			>
 			<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
 			<option value="ssl">COM_CONFIG_FIELD_VALUE_SSL</option>
 			<option value="tls">COM_CONFIG_FIELD_VALUE_TLS</option>
@@ -627,7 +625,7 @@
 			default="0"
 			showon="mailonline:1[AND]mailer:smtp"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -686,7 +684,7 @@
 			label="JFIELD_METADATA_ROBOTS_LABEL"
 			description="JFIELD_METADATA_ROBOTS_DESC"
 			default=""
-		>
+			>
 			<option value="">JGLOBAL_INDEX_FOLLOW</option>
 			<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
 			<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
@@ -706,12 +704,12 @@
 		<field
 			name="MetaAuthor"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONFIG_FIELD_METAAUTHOR_LABEL"
 			description="COM_CONFIG_FIELD_METAAUTHOR_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -719,12 +717,12 @@
 		<field
 			name="MetaVersion"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_METAVERSION_LABEL"
 			description="COM_CONFIG_FIELD_METAVERSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -738,12 +736,12 @@
 		<field
 			name="sef"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONFIG_FIELD_SEF_URL_LABEL"
 			description="COM_CONFIG_FIELD_SEF_URL_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -751,13 +749,13 @@
 		<field
 			name="sef_rewrite"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_SEF_REWRITE_LABEL"
 			description="COM_CONFIG_FIELD_SEF_REWRITE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
 			showon="sef:1"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -765,13 +763,13 @@
 		<field
 			name="sef_suffix"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_SEF_SUFFIX_LABEL"
 			description="COM_CONFIG_FIELD_SEF_SUFFIX_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
 			showon="sef:1"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -779,13 +777,13 @@
 		<field
 			name="unicodeslugs"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_UNICODESLUGS_LABEL"
 			description="COM_CONFIG_FIELD_UNICODESLUGS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
 			showon="sef:1"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -793,11 +791,11 @@
 		<field
 			name="sitename_pagetitles"
 			type="list"
-			default="0"
 			label="COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL"
 			description="COM_CONFIG_FIELD_SITENAME_PAGETITLES_DESC"
+			default="0"
 			filter="integer"
-		>
+			>
 			<option value="2">COM_CONFIG_FIELD_VALUE_AFTER</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_BEFORE</option>
 			<option value="0">JNO</option>
@@ -821,12 +819,12 @@
 		<field
 			name="gzip"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL"
 			description="COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -834,11 +832,11 @@
 		<field
 			name="error_reporting"
 			type="list"
-			default="default"
 			label="COM_CONFIG_FIELD_ERROR_REPORTING_LABEL"
 			description="COM_CONFIG_FIELD_ERROR_REPORTING_DESC"
+			default="default"
 			filter="cmd"
-		>
+			>
 			<option value="default">COM_CONFIG_FIELD_VALUE_SYSTEM_DEFAULT</option>
 			<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
 			<option value="simple">COM_CONFIG_FIELD_VALUE_SIMPLE</option>
@@ -849,11 +847,11 @@
 		<field
 			name="force_ssl"
 			type="list"
-			default="-1"
 			label="COM_CONFIG_FIELD_FORCE_SSL_LABEL"
 			description="COM_CONFIG_FIELD_FORCE_SSL_DESC"
+			default="-1"
 			filter="integer"
-		>
+			>
 			<option value="0">COM_CONFIG_FIELD_VALUE_NONE</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY</option>
 			<option value="2">COM_CONFIG_FIELD_VALUE_ENTIRE_SITE</option>
@@ -945,7 +943,7 @@
 			class="btn-group btn-group-yesno"
 			default="0"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -969,12 +967,12 @@
 		<field
 			name="offline"
 			type="radio"
-			class="btn-group btn-group-yesno btn-group-reversed"
-			default="0"
 			label="COM_CONFIG_FIELD_SITE_OFFLINE_LABEL"
 			description="COM_CONFIG_FIELD_SITE_OFFLINE_DESC"
+			class="btn-group btn-group-yesno btn-group-reversed"
+			default="0"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -982,12 +980,12 @@
 		<field
 			name="display_offline_message"
 			type="list"
-			default="1"
 			label="COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_LABEL"
 			description="COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_DESC"
+			default="1"
 			filter="integer"
 			showon="offline:1"
-		>
+			>
 			<option value="0">JHIDE</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_CUSTOM</option>
 			<option value="2">COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_LANGUAGE</option>
@@ -1015,11 +1013,11 @@
 		<field
 			name="frontediting"
 			type="list"
-			default="1"
 			label="COM_CONFIG_FRONTEDITING_LABEL"
 			description="COM_CONFIG_FRONTEDITING_DESC"
+			default="1"
 			filter="integer"
-		>
+			>
 			<option value="2">COM_CONFIG_FRONTEDITING_MENUSANDMODULES</option>
 			<option value="1">COM_CONFIG_FRONTEDITING_MODULES</option>
 			<option value="0">JNONE</option>
@@ -1028,42 +1026,42 @@
 		<field
 			name="editor"
 			type="plugins"
-			folder="editors"
-			default="tinymce"
 			label="COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC"
+			folder="editors"
+			default="tinymce"
 			filter="cmd"
 		/>
 
 		<field
 			name="captcha"
 			type="plugins"
-			folder="captcha"
-			default="0"
 			label="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC"
+			folder="captcha"
+			default="0"
 			filter="cmd"
-		>
+			>
 			<option value="0">JOPTION_DO_NOT_USE</option>
 		</field>
 
 		<field
 			name="access"
 			type="accesslevel"
-			default="1"
 			label="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC"
+			default="1"
 			filter="integer"
 		/>
 
 		<field
 			name="list_limit"
 			type="list"
-			default="20"
 			label="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_DESC"
+			default="20"
 			filter="integer"
-		>
+			>
 			<option value="5">J5</option>
 			<option value="10">J10</option>
 			<option value="15">J15</option>
@@ -1079,11 +1077,11 @@
 		<field
 			name="feed_limit"
 			type="list"
-			default="10"
 			label="COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_DESC"
+			default="10"
 			filter="integer"
-		>
+			>
 			<option value="5">J5</option>
 			<option value="10">J10</option>
 			<option value="15">J15</option>
@@ -1097,11 +1095,11 @@
 		<field
 			name="feed_email"
 			type="list"
-			default="none"
 			label="COM_CONFIG_FIELD_FEED_EMAIL_LABEL"
 			description="COM_CONFIG_FIELD_FEED_EMAIL_DESC"
+			default="none"
 			filter="word"
-		>
+			>
 			<option value="author">COM_CONFIG_FIELD_VALUE_AUTHOR_EMAIL</option>
 			<option value="site">COM_CONFIG_FIELD_VALUE_SITE_EMAIL</option>
 			<option value="none">COM_CONFIG_FIELD_VALUE_NO_EMAIL</option>
@@ -1169,7 +1167,7 @@
 			translate_label="false"
 			validate="rules"
 			filter="rules"
-		>
+			>
 			<action
 				name="core.login.site"
 				title="JACTION_LOGIN_SITE"
diff --git a/administrator/components/com_contact/models/forms/contact.xml b/administrator/components/com_contact/models/forms/contact.xml
index 1f539b28a1b82..397a2099dd30d 100644
--- a/administrator/components/com_contact/models/forms/contact.xml
+++ b/administrator/components/com_contact/models/forms/contact.xml
@@ -60,7 +60,7 @@
 			id="published"
 			class="chzn-color-state"
 			size="1"
-		>
+			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 			<option value="2">JARCHIVED</option>
@@ -737,10 +737,10 @@
 			<field
 				name="show_user_custom_fields"
 				type="fieldgroups"
-				multiple="true"
-				context="com_users.user"
 				label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
 				description="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_DESC"
+				multiple="true"
+				context="com_users.user"
 				>
 				<option value="-1">JALL</option>
 			</field>
diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index 21f34112cb57b..01b5110bf3dda 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -3,10 +3,12 @@
 	<fieldset
 		name="articles"
 		label="JGLOBAL_ARTICLES"
-		description="COM_CONTENT_CONFIG_ARTICLE_SETTINGS_DESC">
+		description="COM_CONTENT_CONFIG_ARTICLE_SETTINGS_DESC"
+	>
 
 		<field
-			name="article_layout" type="componentlayout"
+			name="article_layout"
+			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
 			description="JGLOBAL_FIELD_LAYOUT_DESC"
 			menuitems="true"
@@ -17,10 +19,11 @@
 		<field
 			name="show_title"
 			type="radio"
+			label="JGLOBAL_SHOW_TITLE_LABEL"
+			description="JGLOBAL_SHOW_TITLE_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_SHOW_TITLE_LABEL"
-			description="JGLOBAL_SHOW_TITLE_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -28,11 +31,12 @@
 		<field
 			name="link_titles"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="JGLOBAL_LINKED_TITLES_LABEL"
 			description="JGLOBAL_LINKED_TITLES_DESC"
-			showon="show_title:1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="show_title:1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -40,10 +44,11 @@
 		<field
 			name="show_intro"
 			type="radio"
+			label="JGLOBAL_SHOW_INTRO_LABEL"
+			description="JGLOBAL_SHOW_INTRO_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_SHOW_INTRO_LABEL"
-			description="JGLOBAL_SHOW_INTRO_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -51,9 +56,10 @@
 		<field
 			name="info_block_position"
 			type="list"
-			default="0"
 			label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
-			description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
+			description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"
+			default="0"
+			>
 			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
 			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
 			<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
@@ -62,10 +68,11 @@
 		<field
 			name="info_block_show_title"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 			description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -73,10 +80,11 @@
 		<field
 			name="show_category"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_CATEGORY_LABEL"
 			description="JGLOBAL_SHOW_CATEGORY_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -84,11 +92,12 @@
 		<field
 			name="link_category"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_LINK_CATEGORY_LABEL"
 			description="JGLOBAL_LINK_CATEGORY_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-			showon="show_category:1">
+			showon="show_category:1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -96,10 +105,11 @@
 		<field
 			name="show_parent_category"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 			description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -107,11 +117,12 @@
 		<field
 			name="link_parent_category"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 			description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-			showon="show_parent_category:1">
+			showon="show_parent_category:1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -125,11 +136,11 @@
 		<field
 			name="show_associations"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
 			description="JGLOBAL_SHOW_ASSOCIATIONS_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -137,12 +148,12 @@
 		<field
 			name="flags"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_FLAG_LABEL"
 			description="JGLOBAL_SHOW_FLAG_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
 			showon="show_associations:1"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -156,10 +167,11 @@
 		<field
 			name="show_author"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_AUTHOR_LABEL"
 			description="JGLOBAL_SHOW_AUTHOR_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -167,11 +179,12 @@
 		<field
 			name="link_author"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_LINK_AUTHOR_LABEL"
 			description="JGLOBAL_LINK_AUTHOR_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
-			showon="show_author:1">
+			showon="show_author:1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -179,10 +192,11 @@
 		<field
 			name="show_create_date"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 			description="JGLOBAL_SHOW_CREATE_DATE_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -190,10 +204,11 @@
 		<field
 			name="show_modify_date"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 			description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -201,10 +216,11 @@
 		<field
 			name="show_publish_date"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 			description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -212,10 +228,11 @@
 		<field
 			name="show_item_navigation"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 			description="JGLOBAL_SHOW_NAVIGATION_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -223,20 +240,23 @@
 		<field
 			name="show_vote"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_VOTE_LABEL"
 			description="JGLOBAL_SHOW_VOTE_DESC"
-			default="0">
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="show_readmore"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_READMORE_LABEL"
 			description="JGLOBAL_SHOW_READMORE_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -244,11 +264,12 @@
 		<field
 			name="show_readmore_title"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 			description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-			showon="show_readmore:1">
+			showon="show_readmore:1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -263,13 +284,14 @@
 		/>
 
 		<field
-			id="show_tags"
 			name="show_tags"
 			type="radio"
+			label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
+			description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"
+			id="show_tags"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
-			description="COM_CONTENT_FIELD_SHOW_TAGS_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -279,13 +301,15 @@
 			type="spacer"
 			hr="true"
 		/>
+
 		<field
 			name="show_icons"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_ICONS_LABEL"
 			description="JGLOBAL_SHOW_ICONS_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -293,10 +317,11 @@
 		<field
 			name="show_print_icon"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
 			description="JGLOBAL_SHOW_PRINT_ICON_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -304,10 +329,11 @@
 		<field
 			name="show_email_icon"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
 			description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -315,10 +341,11 @@
 		<field
 			name="show_hits"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_HITS_LABEL"
 			description="JGLOBAL_SHOW_HITS_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -326,25 +353,33 @@
 		<field
 			name="show_noauth"
 			type="radio"
+			label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+			description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 			class="btn-group btn-group-yesno"
 			default="0"
-			label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
-			description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="urls_position"
 			type="list"
-			default="0"
 			label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
-			description="COM_CONTENT_FIELD_URLSPOSITION_DESC">
+			description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
+			default="0"
+			>
 			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
 			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
 		</field>
 	</fieldset>
-	<fieldset name="editinglayout" label="COM_CONTENT_EDITING_LAYOUT"
-		description="COM_CONTENT_CONFIG_EDITOR_LAYOUT">
+
+	<fieldset 
+		name="editinglayout" 
+		label="COM_CONTENT_EDITING_LAYOUT"
+		description="COM_CONTENT_CONFIG_EDITOR_LAYOUT"
+	>
+
 		<field
 			name="captcha"
 			type="plugins"
@@ -353,80 +388,88 @@
 			default=""
 			folder="captcha"
 			filter="cmd"
-		>
+			>
 			<option value="">JOPTION_USE_DEFAULT</option>
 			<option value="0">JOPTION_DO_NOT_USE</option>
 		</field>
+
 		<field
 			name="show_publishing_options"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_LABEL"
 			description="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="show_article_options"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONTENT_SHOW_ARTICLE_OPTIONS_LABEL"
 			description="COM_CONTENT_SHOW_ARTICLE_OPTIONS_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="save_history"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
 			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="history_limit"
 			type="text"
-			filter="integer"
 			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
 			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			filter="integer"
 			default="10"
 			showon="save_history:1"
 		/>
+
 		<field
 			name="show_urls_images_frontend"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_LABEL"
 			description="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="show_urls_images_backend"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONTENT_SHOW_IMAGES_URLS_BACK_LABEL"
 			description="COM_CONTENT_SHOW_IMAGES_URLS_BACK_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="spacer3"
 			type="spacer"
 			hr="true"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
 		/>
+
 		<field
 			name="targeta"
 			type="list"
@@ -435,12 +478,13 @@
 			default="Parent"
 			filter="int"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
-		>
+			>
 			<option value="0">JBROWSERTARGET_PARENT</option>
 			<option value="1">JBROWSERTARGET_NEW</option>
 			<option value="2">JBROWSERTARGET_POPUP</option>
 			<option value="3">JBROWSERTARGET_MODAL</option>
 		</field>
+
 		<field
 			name="targetb"
 			type="list"
@@ -449,12 +493,13 @@
 			default="Parent"
 			filter="int"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
-		>
+			>
 			<option value="0">JBROWSERTARGET_PARENT</option>
 			<option value="1">JBROWSERTARGET_NEW</option>
 			<option value="2">JBROWSERTARGET_POPUP</option>
 			<option value="3">JBROWSERTARGET_MODAL</option>
 		</field>
+
 		<field
 			name="targetc"
 			type="list"
@@ -463,12 +508,13 @@
 			default="Parent"
 			filter="int"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
-		>
+			>
 			<option value="0">JBROWSERTARGET_PARENT</option>
 			<option value="1">JBROWSERTARGET_NEW</option>
 			<option value="2">JBROWSERTARGET_POPUP</option>
 			<option value="3">JBROWSERTARGET_MODAL</option>
 		</field>
+
 		<field
 			name="spacer4"
 			type="spacer"
@@ -482,18 +528,19 @@
 			label="COM_CONTENT_FLOAT_INTRO_LABEL"
 			description="COM_CONTENT_FLOAT_DESC"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
-		>
+			>
 			<option value="right">COM_CONTENT_RIGHT</option>
 			<option value="left">COM_CONTENT_LEFT</option>
 			<option value="none">COM_CONTENT_NONE</option>
 		</field>
+
 		<field
 			name="float_fulltext"
 			type="list"
 			label="COM_CONTENT_FLOAT_FULLTEXT_LABEL"
 			description="COM_CONTENT_FLOAT_DESC"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
-		>
+			>
 			<option value="right">COM_CONTENT_RIGHT</option>
 			<option value="left">COM_CONTENT_LEFT</option>
 			<option value="none">COM_CONTENT_NONE</option>
@@ -501,65 +548,77 @@
 
 	</fieldset>
 
-	<fieldset name="category"
+	<fieldset
+		name="category"
 		label="JCATEGORY"
 		description="COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC"
 	>
 
 		<field
-			name="category_layout" type="componentlayout"
+			name="category_layout" 
+			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
 			description="JGLOBAL_FIELD_LAYOUT_DESC"
 			menuitems="true"
 			extension="com_content"
 			view="category"
 		/>
+
 		<field
 			name="show_category_heading_title_text"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
 			description="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC"
-			default="1">
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
-		<field name="show_category_title"
+
+		<field 
+			name="show_category_title"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_CATEGORY_TITLE"
 			description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_description"
+		<field 
+			name="show_description"
 			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
-			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_description_image"
+		<field 
+			name="show_description_image"
 			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
 			class="btn-group btn-group-yesno"
 			default="0"
-			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
-			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="maxLevel" type="list"
-			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+		<field 
+			name="maxLevel" 
+			type="list"
 			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
 			default="-1"
-		>
+			>
 			<option value="0">JNONE</option>
 			<option value="-1">JALL</option>
 			<option value="1">J1</option>
@@ -569,82 +628,92 @@
 			<option value="5">J5</option>
 		</field>
 
-		<field name="show_empty_categories"
+		<field 
+			name="show_empty_categories"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 			description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_no_articles"
+		<field 
+			name="show_no_articles"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="COM_CONTENT_NO_ARTICLES_LABEL"
 			description="COM_CONTENT_NO_ARTICLES_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_subcat_desc"
+		<field 
+			name="show_subcat_desc"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
 			default="1"
-		>
+			class="btn-group btn-group-yesno"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_cat_num_articles"
+		<field 
+			name="show_cat_num_articles"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 			description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_cat_tags" type="radio"
+		<field 
+			name="show_cat_tags" 
+			type="radio"
 			label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL"
 			description="COM_CONTENT_FIELD_SHOW_CAT_TAGS_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
 	</fieldset>
 
-	<fieldset name="categories"
+	<fieldset 
+		name="categories"
 		label="JCATEGORIES"
 		description="COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_DESC"
 	>
-		<field name="show_base_description"
+		<field 
+			name="show_base_description"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
 			description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="maxLevelcat" type="list"
-			default="-1"
-			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+		<field 
+			name="maxLevelcat" 
+			type="list"
 			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
-		>
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			default="-1"
+			>
 			<option value="0">JNONE</option>
 			<option value="-1">JALL</option>
 			<option value="1">J1</option>
@@ -654,101 +723,109 @@
 			<option value="5">J5</option>
 		</field>
 
-		<field name="show_empty_categories_cat"
+		<field 
+			name="show_empty_categories_cat"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 			description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			showon="maxLevelcat:-1,1,2,3,4,5"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_subcat_desc_cat"
+		<field 
+			name="show_subcat_desc_cat"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
 			showon="maxLevelcat:-1,1,2,3,4,5"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_cat_num_articles_cat"
+		<field 
+			name="show_cat_num_articles_cat"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 			description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
 	</fieldset>
 
-	<fieldset name="blog_default_parameters"
+	<fieldset 
+		name="blog_default_parameters"
 		label="COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL"
 		description="COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC"
 	>
 
-		<field name="num_leading_articles"
+		<field 
+			name="num_leading_articles"
 			type="text"
-			default="1"
 			label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
-			description="JGLOBAL_NUM_LEADING_ARTICLES_DESC">
-		</field>
+			description="JGLOBAL_NUM_LEADING_ARTICLES_DESC"
+			default="1"			
+		/>
 
-		<field name="num_intro_articles"
+		<field 
+			name="num_intro_articles"
 			type="text"
-			default="4"
 			label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
-			description="JGLOBAL_NUM_INTRO_ARTICLES_DESC">
-		</field>
+			description="JGLOBAL_NUM_INTRO_ARTICLES_DESC"
+			default="4"
+		/>
 
-		<field name="num_columns"
+		<field 
+			name="num_columns"
 			type="text"
-			default="2"
 			label="JGLOBAL_NUM_COLUMNS_LABEL"
-			description="JGLOBAL_NUM_COLUMNS_DESC">
-		</field>
+			description="JGLOBAL_NUM_COLUMNS_DESC"
+			default="2"
+		/>
 
-		<field name="num_links"
+		<field 
+			name="num_links"
 			type="text"
-			default="4"
 			label="JGLOBAL_NUM_LINKS_LABEL"
-			description="JGLOBAL_NUM_LINKS_DESC">
-		</field>
+			description="JGLOBAL_NUM_LINKS_DESC"
+			default="4"
+		/>
 
-		<field name="multi_column_order"
+		<field 
+			name="multi_column_order"
 			type="list"
-			default="0"
 			label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
 			description="JGLOBAL_MULTI_COLUMN_ORDER_DESC"
+			default="0"
 			showon="num_columns!:,0,1"
-		>
-			<option
-				value="0">JGLOBAL_DOWN
-			</option>
-			<option
-				value="1">JGLOBAL_ACROSS
-			</option>
+			>
+			<option value="0">JGLOBAL_DOWN</option>
+			<option value="1">JGLOBAL_ACROSS</option>
 		</field>
 
-		<field name="spacer1"
+		<field 
+			name="spacer1"
 			type="spacer"
 			hr="true"
 		/>
 
-		<field name="show_subcategory_content" type="list"
-			default="0"
-			description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC"
+		<field 
+			name="show_subcategory_content" 
+			type="list"
 			label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
-		>
+			description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC"
+			default="0"
+			>
 			<option value="0">JNONE</option>
 			<option value="-1">JALL</option>
 			<option value="1">J1</option>
@@ -759,27 +836,32 @@
 		</field>
 	</fieldset>
 
-	<fieldset name="list_default_parameters"
+	<fieldset 
+		name="list_default_parameters"
 		label="JGLOBAL_LIST_LAYOUT_OPTIONS"
 		description="COM_CONTENT_CONFIG_LIST_SETTINGS_DESC"
 		addfieldpath="/administrator/components/com_content/models/fields"
 	>
 
-		<field name="show_pagination_limit"
+		<field 
+			name="show_pagination_limit"
 			type="radio"
+			label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			description="JGLOBAL_DISPLAY_SELECT_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_DISPLAY_SELECT_LABEL"
-			description="JGLOBAL_DISPLAY_SELECT_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="filter_field"
+		<field 
+			name="filter_field"
 			type="list"
-			default="hide"
 			label="JGLOBAL_FILTER_FIELD_LABEL"
-			description="JGLOBAL_FILTER_FIELD_DESC">
+			description="JGLOBAL_FILTER_FIELD_DESC"
+			default="hide"
+			>
 			<option value="hide">JHIDE</option>
 			<option value="title">JGLOBAL_TITLE</option>
 			<option value="author">JAUTHOR</option>
@@ -787,181 +869,174 @@
 			<option value="tag">JTAG</option>
 		</field>
 
-		<field name="show_headings"
+		<field 
+			name="show_headings"
 			type="radio"
+			label="JGLOBAL_SHOW_HEADINGS_LABEL"
+			description="JGLOBAL_SHOW_HEADINGS_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_SHOW_HEADINGS_LABEL"
-			description="JGLOBAL_SHOW_HEADINGS_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="list_show_date"
+		<field 
+			name="list_show_date"
 			type="list"
-			default="0"
 			label="JGLOBAL_SHOW_DATE_LABEL"
-			description="JGLOBAL_SHOW_DATE_DESC">
+			description="JGLOBAL_SHOW_DATE_DESC"
+			default="0"
+			>
 			<option value="0">JHIDE</option>
 			<option value="created">JGLOBAL_CREATED</option>
 			<option value="modified">JGLOBAL_MODIFIED</option>
 			<option value="published">JPUBLISHED</option>
 		</field>
 
-		<field name="date_format"
+		<field 
+			name="date_format"
 			type="text"
-			size="15"
 			label="JGLOBAL_DATE_FORMAT_LABEL"
 			description="JGLOBAL_DATE_FORMAT_DESC"
+			size="15"
 			showon="list_show_date:created,modified,published"
 		/>
 
-		<field name="list_show_hits"
+		<field 
+			name="list_show_hits"
 			type="radio"
+			label="JGLOBAL_LIST_HITS_LABEL"
+			description="JGLOBAL_LIST_HITS_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_LIST_HITS_LABEL"
-			description="JGLOBAL_LIST_HITS_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="list_show_author"
+		<field 
+			name="list_show_author"
 			type="radio"
+			label="JGLOBAL_LIST_AUTHOR_LABEL"
+			description="JGLOBAL_LIST_AUTHOR_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_LIST_AUTHOR_LABEL"
-			description="JGLOBAL_LIST_AUTHOR_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="list_show_votes"
+		<field 
+			name="list_show_votes"
 			type="votelist"
-			default="0"
 			label="JGLOBAL_LIST_VOTES_LABEL"
-			description="JGLOBAL_LIST_VOTES_DESC">
+			description="JGLOBAL_LIST_VOTES_DESC"
+			default="0"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="list_show_ratings"
+		<field 
+			name="list_show_ratings"
 			type="votelist"
-			default="0"
 			label="JGLOBAL_LIST_RATINGS_LABEL"
-			description="JGLOBAL_LIST_RATINGS_DESC">
+			description="JGLOBAL_LIST_RATINGS_DESC"
+			default="0"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
 	</fieldset>
 
-	<fieldset name="shared"
+	<fieldset
+		name="shared"
 		label="COM_CONTENT_SHARED_LABEL"
 		description="COM_CONTENT_SHARED_DESC"
 	>
-		<field name="orderby_pri"
+	
+		<field 
+			name="orderby_pri"
 			type="list"
-			default="none"
 			label="JGLOBAL_CATEGORY_ORDER_LABEL"
-			description="JGLOBAL_CATEGORY_ORDER_DESC">
-			<option
-				value="none">JGLOBAL_NO_ORDER
-			</option>
-			<option
-				value="alpha">JGLOBAL_TITLE_ALPHABETICAL
-			</option>
-			<option
-				value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL
-			</option>
-			<option
-				value="order">JGLOBAL_CATEGORY_MANAGER_ORDER
-			</option>
-		</field>
-
-		<field name="orderby_sec"
+			description="JGLOBAL_CATEGORY_ORDER_DESC"
+			default="none"
+			>
+			<option value="none">JGLOBAL_NO_ORDER</option>
+			<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+			<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+			<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+		</field>
+
+		<field 
+			name="orderby_sec"
 			type="list"
-			default="rdate"
 			label="JGLOBAL_ARTICLE_ORDER_LABEL"
-			description="JGLOBAL_ARTICLE_ORDER_DESC">
-			<option
-				value="rdate">JGLOBAL_MOST_RECENT_FIRST
-			</option>
-			<option
-				value="date">JGLOBAL_OLDEST_FIRST
-			</option>
-			<option
-				value="alpha">JGLOBAL_TITLE_ALPHABETICAL
-			</option>
-			<option
-				value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL
-			</option>
-			<option
-				value="author">JGLOBAL_AUTHOR_ALPHABETICAL
-			</option>
-			<option
-				value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL
-			</option>
-			<option
-				value="hits">JGLOBAL_MOST_HITS
-			</option>
-			<option
-				value="rhits">JGLOBAL_LEAST_HITS
-			</option>
-			<option
-				value="order">JGLOBAL_ARTICLE_MANAGER_ORDER
-			</option>
-			<option
-				value="vote" requires="vote">JGLOBAL_VOTES_DESC
-			</option>
-			<option
-				value="rvote" requires="vote">JGLOBAL_VOTES_ASC
-			</option>
-			<option
-				value="rank" requires="vote">JGLOBAL_RATINGS_DESC
-			</option>
-			<option
-				value="rrank" requires="vote">JGLOBAL_RATINGS_ASC
-			</option>
-		</field>
-
-		<field name="order_date" type="list"
-			default="published"
-			description="JGLOBAL_ORDERING_DATE_DESC"
+			description="JGLOBAL_ARTICLE_ORDER_DESC"
+			default="rdate"
+			>
+			<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+			<option value="date">JGLOBAL_OLDEST_FIRST</option>
+			<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+			<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+			<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+			<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+			<option value="hits">JGLOBAL_MOST_HITS</option>
+			<option value="rhits">JGLOBAL_LEAST_HITS</option>
+			<option value="order">JGLOBAL_ARTICLE_MANAGER_ORDER</option>
+			<option value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
+			<option value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
+			<option value="rank" requires="vote">JGLOBAL_RATINGS_DESC</option>
+			<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
+		</field>
+
+		<field 
+			name="order_date" 
+			type="list"
 			label="JGLOBAL_ORDERING_DATE_LABEL"
+			description="JGLOBAL_ORDERING_DATE_DESC"
 			showon="orderby_sec:rdate,date"
-		>
+			default="published"
+			>
 			<option value="created">JGLOBAL_CREATED</option>
 			<option value="modified">JGLOBAL_MODIFIED</option>
 			<option value="published">JPUBLISHED</option>
 		</field>
 
-		<field name="show_pagination"
+		<field 
+			name="show_pagination"
 			type="list"
-			default="2"
 			label="JGLOBAL_PAGINATION_LABEL"
-			description="JGLOBAL_PAGINATION_DESC">
+			description="JGLOBAL_PAGINATION_DESC"
+			default="2"
+			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
 			<option value="2">JGLOBAL_AUTO</option>
 		</field>
 
-		<field name="show_pagination_results"
+		<field 
+			name="show_pagination_results"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
 			showon="show_pagination:1,2"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_featured" type="list" default="show"
+		<field 
+			name="show_featured" 
+			type="list" 
 			label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
 			description="JGLOBAL_SHOW_FEATURED_ARTICLES_DESC"
-		>
+			default="show"
+			>
 			<option value="show">JSHOW</option>
 			<option value="hide">JHIDE</option>
 			<option value="only">JONLY</option>
@@ -969,7 +1044,8 @@
 
 	</fieldset>
 
-	<fieldset name="integration"
+	<fieldset 
+		name="integration"
 		label="JGLOBAL_INTEGRATION_LABEL"
 		description="COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_DESC"
 	>
@@ -977,10 +1053,11 @@
 		<field
 			name="show_feed_link"
 			type="radio"
+			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			description="JGLOBAL_SHOW_FEED_LINK_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
-			description="JGLOBAL_SHOW_FEED_LINK_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -992,24 +1069,20 @@
 			description="JGLOBAL_FEED_SUMMARY_DESC"
 			default="0"
 			showon="show_feed_link:1"
-		>
-			<option
-				value="0">JGLOBAL_INTRO_TEXT
-			</option>
-			<option
-				value="1">JGLOBAL_FULL_TEXT
-			</option>
+			>
+			<option value="0">JGLOBAL_INTRO_TEXT</option>
+			<option value="1">JGLOBAL_FULL_TEXT</option>
 		</field>
 
 		<field
 			name="feed_show_readmore"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_FEED_SHOW_READMORE_LABEL"
 			description="JGLOBAL_FEED_SHOW_READMORE_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
 			showon="show_feed_link:1[AND]feed_summary:0"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -1017,11 +1090,11 @@
 		<field
 			name="custom_fields_enable"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
 			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -1041,6 +1114,7 @@
 			validate="rules"
 			filter="rules"
 			component="com_content"
-			section="component"/>
+			section="component"
+		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml
index e2bd5ee3b4df6..c41a0dad11589 100644
--- a/administrator/components/com_content/models/forms/article.xml
+++ b/administrator/components/com_content/models/forms/article.xml
@@ -1,163 +1,270 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset addfieldpath="/administrator/components/com_categories/models/fields" >
-		<field name="id"  type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-			readonly="true" />
+		<field 
+			name="id" 
+			type="text" 
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC" 
+			class="readonly" 
+			size="10" 
+			default="0"
+			readonly="true" 
+		/>
 
-		<field name="asset_id" type="hidden" filter="unset" />
+		<field 
+			name="asset_id" 
+			type="hidden" 
+			filter="unset" 
+		/>
 
-		<field name="title" type="text" label="JGLOBAL_TITLE"
+		<field 
+			name="title" 
+			type="text" 
+			label="JGLOBAL_TITLE"
 			description="JFIELD_TITLE_DESC"
 			class="input-xxlarge input-large-text"
 			size="40"
-			required="true" />
+			required="true" 
+		/>
 
-		<field name="alias" type="text" label="JFIELD_ALIAS_LABEL"
+		<field 
+			name="alias" 
+			type="text" 
+			label="JFIELD_ALIAS_LABEL"
 			description="JFIELD_ALIAS_DESC"
 			hint="JFIELD_ALIAS_PLACEHOLDER"
-			size="40" />
+			size="40" 
+		/>
 
-		<field name="version_note" type="text" label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+		<field 
+			name="version_note" 
+			type="text" 
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
 			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
 			class="span12"
 			maxlength="255"
-			size="45" />
-
-		<field name="articletext" type="editor"
-			label="COM_CONTENT_FIELD_ARTICLETEXT_LABEL" description="COM_CONTENT_FIELD_ARTICLETEXT_DESC"
-			filter="JComponentHelper::filterText" buttons="true" />
-
-		<field name="state" type="list" label="JSTATUS"
-			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-			filter="intval" size="1" default="1"
-		>
-			<option value="1">
-				JPUBLISHED</option>
-			<option value="0">
-				JUNPUBLISHED</option>
-			<option value="2">
-				JARCHIVED</option>
-			<option value="-2">
-				JTRASHED</option>
+			size="45"
+		/>
+
+		<field 
+			name="articletext" 
+			type="editor"
+			label="COM_CONTENT_FIELD_ARTICLETEXT_LABEL" 
+			description="COM_CONTENT_FIELD_ARTICLETEXT_DESC"
+			filter="JComponentHelper::filterText"
+			buttons="true" 
+		/>
+
+		<field 
+			name="state" 
+			type="list" 
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC" 
+			class="chzn-color-state"
+			filter="intval" 
+			size="1" 
+			default="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
 		</field>
 
-		<field name="catid"
-			   type="categoryedit"
+		<field 
+			name="catid"
+			type="categoryedit"
 			label="JCATEGORY"
-			   description="JFIELD_CATEGORY_DESC"
+			description="JFIELD_CATEGORY_DESC"
 			required="true"
-			   default=""
-		>
-		</field>
+			default=""
+		/>
 
-		<field name="tags"
+		<field 
+			name="tags"
 			type="tag"
 			label="JTAG"
 			description="JTAG_DESC"
 			class="span12"
 			multiple="true"
-		>
-		</field>
+		/>
 
 		<field
 			name="buttonspacer"
+			type="spacer" 
 			description="JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION"
-			type="spacer" />
+		/>
 
-		<field name="created" type="calendar" label="COM_CONTENT_FIELD_CREATED_LABEL"
+		<field 
+			name="created" 
+			type="calendar" 
+			label="COM_CONTENT_FIELD_CREATED_LABEL"
 			description="COM_CONTENT_FIELD_CREATED_DESC"
 			translateformat="true"
 			showtime="true"
 			size="22"
-			filter="user_utc" />
+			filter="user_utc" 
+		/>
 
-		<field name="created_by" type="user"
-			label="COM_CONTENT_FIELD_CREATED_BY_LABEL" description="COM_CONTENT_FIELD_CREATED_BY_DESC" />
+		<field 
+			name="created_by" 
+			type="user"
+			label="COM_CONTENT_FIELD_CREATED_BY_LABEL" 
+			description="COM_CONTENT_FIELD_CREATED_BY_DESC" 
+		/>
 
-		<field name="created_by_alias" type="text"
-			label="COM_CONTENT_FIELD_CREATED_BY_ALIAS_LABEL" description="COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC"
-			size="20" />
+		<field 
+			name="created_by_alias" 
+			type="text"
+			label="COM_CONTENT_FIELD_CREATED_BY_ALIAS_LABEL" 
+			description="COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC"
+			size="20" 
+		/>
 
-		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+		<field 
+			name="modified" 
+			type="calendar" 
+			label="JGLOBAL_FIELD_MODIFIED_LABEL" 
+			description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			class="readonly"
 			translateformat="true"
 			showtime="true"
 			size="22"
 			readonly="true"
-			filter="user_utc" />
+			filter="user_utc" 
+		/>
 
-		<field name="modified_by" type="user"
-		label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
-		class="readonly"
-		readonly="true"
-		filter="unset"
-		 />
+		<field 
+			name="modified_by" 
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
 
-		<field name="checked_out" type="hidden" filter="unset" />
+		<field 
+			name="checked_out" 
+			type="hidden" 
+			filter="unset" 
+		/>
 
-		<field name="checked_out_time" type="hidden" filter="unset" />
+		<field 
+			name="checked_out_time" 
+			type="hidden" 
+			filter="unset" 
+		/>
 
-		<field name="publish_up"
+		<field 
+			name="publish_up"
 			type="calendar"
 			label="COM_CONTENT_FIELD_PUBLISH_UP_LABEL"
 			description="COM_CONTENT_FIELD_PUBLISH_UP_DESC"
 			translateformat="true"
 			showtime="true"
 			size="22"
-			filter="user_utc" />
+			filter="user_utc" 
+		/>
 
-		<field name="publish_down"
+		<field 
+			name="publish_down"
 			type="calendar"
 			label="COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL"
 			description="COM_CONTENT_FIELD_PUBLISH_DOWN_DESC"
 			translateformat="true"
 			showtime="true"
 			size="22"
-			filter="user_utc" />
+			filter="user_utc" 
+		/>
 
-		<field name="version" type="text" class="readonly"
-			label="COM_CONTENT_FIELD_VERSION_LABEL" size="6" description="COM_CONTENT_FIELD_VERSION_DESC"
-			readonly="true" filter="unset" />
+		<field
+			name="version" 
+			type="text" 
+			label="COM_CONTENT_FIELD_VERSION_LABEL" 
+			description="COM_CONTENT_FIELD_VERSION_DESC"
+			size="6" 
+			class="readonly"
+			readonly="true" 
+			filter="unset" 
+		/>
 
-		<field name="ordering" type="text" label="JFIELD_ORDERING_LABEL"
-			description="JFIELD_ORDERING_DESC" size="6"
-			default="0" />
+		<field 
+			name="ordering" 
+			type="text" 
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC" 
+			size="6"
+			default="0" 
+		/>
 
-		<field name="metakey" type="textarea"
-			label="JFIELD_META_KEYWORDS_LABEL" description="JFIELD_META_KEYWORDS_DESC"
-			rows="3" cols="30" />
+		<field 
+			name="metakey" 
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL" 
+			description="JFIELD_META_KEYWORDS_DESC"
+			rows="3" 
+			cols="30"
+		/>
 
-		<field name="metadesc" type="textarea"
-			label="JFIELD_META_DESCRIPTION_LABEL" description="JFIELD_META_DESCRIPTION_DESC"
-			rows="3" cols="30" />
+		<field 
+			name="metadesc" 
+			type="textarea"
+			label="JFIELD_META_DESCRIPTION_LABEL" 
+			description="JFIELD_META_DESCRIPTION_DESC"
+			rows="3" 
+			cols="30" 
+		/>
 
-		<field name="access" type="accesslevel" label="JFIELD_ACCESS_LABEL"
-			description="JFIELD_ACCESS_DESC" size="1" />
+		<field 
+			name="access" 
+			type="accesslevel" 
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC" 
+			size="1" 
+		/>
 
-		<field name="hits" type="text" label="JGLOBAL_HITS"
-			description="COM_CONTENT_FIELD_HITS_DESC" class="readonly" size="6"
-			readonly="true" filter="unset" />
+		<field 
+			name="hits" 
+			type="text" 
+			label="JGLOBAL_HITS"
+			description="COM_CONTENT_FIELD_HITS_DESC" 
+			class="readonly" 
+			size="6"
+			readonly="true" 
+			filter="unset" 
+		/>
 
-		<field name="language" type="contentlanguage" label="JFIELD_LANGUAGE_LABEL"
+		<field 
+			name="language" 
+			type="contentlanguage" 
+			label="JFIELD_LANGUAGE_LABEL"
 			description="COM_CONTENT_FIELD_LANGUAGE_DESC"
-		>
+			>
 			<option value="*">JALL</option>
 		</field>
 
-		<field name="featured" type="radio"
-			class="btn-group btn-group-yesno"
+		<field 
+			name="featured" 
+			type="radio"
 			label="JFEATURED"
 			description="COM_CONTENT_FIELD_FEATURED_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 
-		<field name="rules" type="rules" label="JFIELD_RULES_LABEL"
-			translate_label="false" filter="rules"
-			component="com_content" section="article" validate="rules"
+		<field 
+			name="rules" 
+			type="rules" 
+			label="JFIELD_RULES_LABEL"
+			translate_label="false" 
+			filter="rules"
+			component="com_content" 
+			section="article" 
+			validate="rules"
 		/>
 
 	</fieldset>
@@ -165,19 +272,22 @@
 	<fields name="attribs" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
 		<fieldset name="basic" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
 
-			<field name="article_layout" type="componentlayout"
-			       label="JFIELD_ALT_LAYOUT_LABEL"
-			       description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
-			       useglobal="true"
-			       extension="com_content" view="article"
+			<field 
+				name="article_layout" 
+				type="componentlayout"
+				label="JFIELD_ALT_LAYOUT_LABEL"
+				description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
+				useglobal="true"
+				extension="com_content" 
+				view="article"
 			/>
 
 			<field
 				name="show_title"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				description="JGLOBAL_SHOW_TITLE_DESC"
+				class="chzn-color"
 				useglobal="true"
 				>
 				<option value="1">JSHOW</option>
@@ -187,40 +297,42 @@
 			<field
 				name="link_titles"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				description="JGLOBAL_LINKED_TITLES_DESC"
+				class="chzn-color"
 				useglobal="true"
 				>
 				<option	value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
 
-			<field name="show_tags"
+			<field 
+				name="show_tags"
 				type="list"
-				class="chzn-color"
 				label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
 				description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"
+				class="chzn-color"
 				useglobal="true"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field name="show_intro"
+			<field 
+				name="show_intro"
 				type="list"
-				class="chzn-color"
-				description="JGLOBAL_SHOW_INTRO_DESC"
 				label="JGLOBAL_SHOW_INTRO_LABEL"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				class="chzn-color"
 				useglobal="true"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
+
 			<field
 				name="info_block_position"
 				type="list"
-				default=""
 				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
 				description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"
 				useglobal="true"
@@ -233,9 +345,9 @@
 			<field
 				name="info_block_show_title"
 				type="list"
-				class="chzn-color"
 				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 				description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"
+				class="chzn-color"
 				useglobal="true"
 				>
 				<option	value="0">JHIDE</option>
@@ -245,10 +357,10 @@
 			<field
 				name="show_category"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				description="JGLOBAL_SHOW_CATEGORY_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -257,10 +369,10 @@
 			<field
 				name="link_category"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				description="JGLOBAL_LINK_CATEGORY_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JNO</option>
 				<option	value="1">JYES</option>
@@ -269,10 +381,10 @@
 			<field
 				name="show_parent_category"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -281,10 +393,10 @@
 			<field
 				name="link_parent_category"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JNO</option>
 				<option	value="1">JYES</option>
@@ -293,9 +405,9 @@
 			<field
 				name="show_associations"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
 				description="JGLOBAL_SHOW_ASSOCIATIONS_DESC"
+				class="chzn-color"
 				useglobal="true"
 				>
 				<option value="1">JSHOW</option>
@@ -305,10 +417,10 @@
 			<field
 				name="show_author"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				description="JGLOBAL_SHOW_AUTHOR_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -317,10 +429,10 @@
 			<field
 				name="link_author"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				description="JGLOBAL_LINK_AUTHOR_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JNO</option>
 				<option	value="1">JYES</option>
@@ -329,10 +441,10 @@
 			<field
 				name="show_create_date"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -341,10 +453,10 @@
 			<field
 				name="show_modify_date"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -353,9 +465,9 @@
 			<field
 				name="show_publish_date"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				class="chzn-color"
 				useglobal="true"
 				>
 				<option	value="0">JHIDE</option>
@@ -365,10 +477,10 @@
 			<field
 				name="show_item_navigation"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				description="JGLOBAL_SHOW_NAVIGATION_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -377,10 +489,10 @@
 			<field
 				name="show_icons"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_ICONS_LABEL"
 				description="JGLOBAL_SHOW_ICONS_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -389,10 +501,10 @@
 			<field
 				name="show_print_icon"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
 				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -401,10 +513,10 @@
 			<field
 				name="show_email_icon"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
 				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -413,10 +525,10 @@
 			<field
 				name="show_vote"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				description="JGLOBAL_SHOW_VOTE_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -425,10 +537,10 @@
 			<field
 				name="show_hits"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				description="JGLOBAL_SHOW_HITS_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -437,10 +549,10 @@
 			<field
 				name="show_noauth"
 				type="list"
-				class="chzn-color"
 				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -449,10 +561,10 @@
 			<field
 				name="urls_position"
 				type="list"
-				class="chzn-color"
 				label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
 				description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
 				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
@@ -464,63 +576,71 @@
 				hr="true"
 			/>
 
-			<field name="alternative_readmore" type="text"
+			<field 
+				name="alternative_readmore" 
+				type="text"
 				label="JFIELD_READMORE_LABEL"
 				description="JFIELD_READMORE_DESC"
-				size="25" />
+				size="25" 
+			/>
 
-			<field name="article_page_title" type="text"
+			<field 
+				name="article_page_title" 
+				type="text"
 				label="COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_LABEL"
 				description="COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_DESC"
-				size="25" />
-
+				size="25" 
+			/>
 		</fieldset>
 
 		<fieldset name="editorConfig" label="COM_CONTENT_EDITORCONFIG_FIELDSET_LABEL">
 			<field
 				name="show_publishing_options"
 				type="list"
-				class="chzn-color"
-				default=""
 				label="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_LABEL"
 				description="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC"
+				default=""
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
+
 			<field
 				name="show_article_options"
 				type="list"
-				class="chzn-color"
-				default=""
 				label="COM_CONTENT_SHOW_ARTICLE_OPTIONS_LABEL"
 				description="COM_CONTENT_SHOW_ARTICLE_OPTIONS_DESC"
+				default=""
 				useglobal="true"
+				class="chzn-color"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
+
 			<field
 				name="show_urls_images_backend"
 				type="list"
-				class="chzn-color"
-				default=""
 				label="COM_CONTENT_SHOW_IMAGES_URLS_BACK_LABEL"
 				description="COM_CONTENT_SHOW_IMAGES_URLS_BACK_DESC"
 				useglobal="true"
+				class="chzn-color"
+				default=""
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
+
 			<field
 				name="show_urls_images_frontend"
 				type="list"
-				class="chzn-color"
-				default=""
 				label="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_LABEL"
 				description="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC"
 				useglobal="true"
+				class="chzn-color"
+				default=""
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -533,140 +653,145 @@
 				type="hidden"
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				description="JGLOBAL_SHOW_TITLE_DESC"
-				>
-			</field>
+			/>
 
 			<field
 				name="link_titles"
 				type="hidden"
 				label="JGLOBAL_LINKED_TITLES_LABEL"
-				description="JGLOBAL_LINKED_TITLES_DESC">
-			</field>
+				description="JGLOBAL_LINKED_TITLES_DESC"
+			/>
 
-			<field name="show_intro"
+			<field 
+				name="show_intro"
 				type="hidden"
-				description="JGLOBAL_SHOW_INTRO_DESC"
 				label="JGLOBAL_SHOW_INTRO_LABEL"
-				>
-			</field>
+				description="JGLOBAL_SHOW_INTRO_DESC"
+			/>
 
 			<field
 				name="show_category"
 				type="hidden"
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
-				description="JGLOBAL_SHOW_CATEGORY_DESC">
-			</field>
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+			/>
 
 			<field
 				name="link_category"
 				type="hidden"
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
-				description="JGLOBAL_LINK_CATEGORY_DESC">
-			</field>
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+			/>
 
 			<field
 				name="show_parent_category"
 				type="hidden"
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
-				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC">
-			</field>
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+			/>
 
 			<field
 				name="link_parent_category"
 				type="hidden"
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
-				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC">
-			</field>
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+			/>
 
 			<field
 				name="show_author"
 				type="hidden"
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
-				description="JGLOBAL_SHOW_AUTHOR_DESC">
-			</field>
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+			/>
 
 			<field
 				name="link_author"
 				type="hidden"
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
-				description="JGLOBAL_LINK_AUTHOR_DESC">
-			</field>
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+			/>
 
 			<field
 				name="show_create_date"
 				type="hidden"
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
-				description="JGLOBAL_SHOW_CREATE_DATE_DESC">
-			</field>
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+			/>
 
 			<field
 				name="show_modify_date"
 				type="hidden"
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
-				description="JGLOBAL_SHOW_MODIFY_DATE_DESC">
-			</field>
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+			/>
 
 			<field
 				name="show_publish_date"
 				type="hidden"
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
-				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC">
-			</field>
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+			/>
 
 			<field
 				name="show_item_navigation"
 				type="hidden"
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
-				description="JGLOBAL_SHOW_NAVIGATION_DESC">
-			</field>
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+			/>
 
 			<field
 				name="show_icons"
 				type="hidden"
 				label="JGLOBAL_SHOW_ICONS_LABEL"
-				description="JGLOBAL_SHOW_ICONS_DESC">
-			</field>
+				description="JGLOBAL_SHOW_ICONS_DESC"
+			/>
 
 			<field
 				name="show_print_icon"
 				type="hidden"
 				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
-				description="JGLOBAL_SHOW_PRINT_ICON_DESC">
-			</field>
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+			/>
 
 			<field
 				name="show_email_icon"
 				type="hidden"
 				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
-				description="JGLOBAL_SHOW_EMAIL_ICON_DESC">
-			</field>
+				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+			/>
+
 			<field
 				name="show_vote"
 				type="hidden"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				description="JGLOBAL_SHOW_VOTE_DESC"
-			>
-			</field>
+			/>
+
 			<field
 				name="show_hits"
 				type="hidden"
 				label="JGLOBAL_SHOW_HITS_LABEL"
-				description="JGLOBAL_SHOW_HITS_DESC">
-			</field>
+				description="JGLOBAL_SHOW_HITS_DESC"
+			/>
 
 			<field
 				name="show_noauth"
 				type="hidden"
 				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
-				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC">
-			</field>
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+			/>
 
-			<field name="alternative_readmore" type="hidden"
+			<field 
+				name="alternative_readmore" 
+				type="hidden"
 				label="JFIELD_READMORE_LABEL"
 				description="JFIELD_READMORE_DESC"
-				size="25" />
+				size="25" 
+			/>
 
-			<field name="article_layout" type="hidden"
+			<field 
+				name="article_layout" 
+				type="hidden"
 				label="JFIELD_ALT_LAYOUT_LABEL"
 				description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
 				useglobal="true"
@@ -675,17 +800,22 @@
 		</fieldset>
 	</fields>
 
-	<field name="xreference" type="text"
+	<field 
+		name="xreference" 
+		type="text"
 		label="JFIELD_KEY_REFERENCE_LABEL"
 		description="JFIELD_KEY_REFERENCE_DESC"
-		size="20" />
+		size="20" 
+	/>
 
 	<fields name="images" label="COM_CONTENT_FIELD_IMAGE_OPTIONS">
 		<field
 			name="image_intro"
 			type="media"
 			label="COM_CONTENT_FIELD_INTRO_LABEL"
-			description="COM_CONTENT_FIELD_INTRO_DESC" />
+			description="COM_CONTENT_FIELD_INTRO_DESC" 
+		/>
+		
 		<field
 			name="float_intro"
 			type="list"
@@ -697,26 +827,36 @@
 			<option value="left">COM_CONTENT_LEFT</option>
 			<option value="none">COM_CONTENT_NONE</option>
 		</field>
-		<field name="image_intro_alt"
+		
+		<field 
+			name="image_intro_alt"
 			type="text"
 			label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
 			description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
-			size="20"/>
-		<field name="image_intro_caption"
+			size="20"
+		/>
+
+		<field 
+			name="image_intro_caption"
 			type="text"
 			label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
 			description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
-			size="20"/>
+			size="20"
+		/>
+
 		<field
 			name="spacer1"
 			type="spacer"
 			hr="true"
-			/>
+		/>
+
 		<field
 			name="image_fulltext"
 			type="media"
 			label="COM_CONTENT_FIELD_FULL_LABEL"
-			description="COM_CONTENT_FIELD_FULL_DESC"/>
+			description="COM_CONTENT_FIELD_FULL_DESC"
+		/>
+
 		<field
 			name="float_fulltext"
 			type="list"
@@ -728,31 +868,42 @@
 			<option value="left">COM_CONTENT_LEFT</option>
 			<option value="none">COM_CONTENT_NONE</option>
 		</field>
-		<field name="image_fulltext_alt"
+
+		<field 
+			name="image_fulltext_alt"
 			type="text"
 			label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
 			description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
-			size="20"/>
-		<field name="image_fulltext_caption"
+			size="20"
+		/>
+			
+		<field 
+			name="image_fulltext_caption"
 			type="text"
 			label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
 			description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
-			size="20"/>
+			size="20"
+		/>
 	</fields>
 	<fields name="urls" label="COM_CONTENT_FIELD_URLS_OPTIONS">
 		<field
 			name="urla"
 			type="url"
+			label="COM_CONTENT_FIELD_URLA_LABEL"
+			description="COM_CONTENT_FIELD_URL_DESC"
 			validate="url"
 			filter="url"
 			relative="true"
-			label="COM_CONTENT_FIELD_URLA_LABEL"
-			description="COM_CONTENT_FIELD_URL_DESC" />
-		<field name="urlatext"
+		/>
+
+		<field 
+			name="urlatext"
 			type="text"
 			label="COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL"
 			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
-			size="20"/>
+			size="20"
+		/>
+
 		<field
 			name="targeta"
 			type="list"
@@ -767,24 +918,31 @@
 			<option value="2">JBROWSERTARGET_POPUP</option>
 			<option value="3">JBROWSERTARGET_MODAL</option>
 		</field>
+
 		<field
 			name="spacer3"
 			type="spacer"
 			hr="true"
-			/>
+		/>
+
 		<field
 			name="urlb"
 			type="url"
+			label="COM_CONTENT_FIELD_URLB_LABEL"
+			description="COM_CONTENT_FIELD_URL_DESC"
 			validate="url"
 			filter="url"
 			relative="true"
-			label="COM_CONTENT_FIELD_URLB_LABEL"
-			description="COM_CONTENT_FIELD_URL_DESC"/>
-		<field name="urlbtext"
+		/>
+
+		<field 
+			name="urlbtext"
 			type="text"
 			label="COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL"
 			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
-			size="20"/>
+			size="20"
+		/>
+
 		<field
 			name="targetb"
 			type="list"
@@ -799,25 +957,31 @@
 			<option value="2">JBROWSERTARGET_POPUP</option>
 			<option value="3">JBROWSERTARGET_MODAL</option>
 		</field>
+
 		<field
 			name="spacer4"
 			type="spacer"
 			hr="true"
-			/>
+		/>
+
 		<field
 			name="urlc"
 			type="url"
+			label="COM_CONTENT_FIELD_URLC_LABEL"
+			description="COM_CONTENT_FIELD_URL_DESC"
 			validate="url"
 			filter="url"
 			relative="true"
-			label="COM_CONTENT_FIELD_URLC_LABEL"
-			description="COM_CONTENT_FIELD_URL_DESC"/>
+		/>
+
 		<field
 			name="urlctext"
 			type="text"
 			label="COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL"
 			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
-			size="20"/>
+			size="20"
+		/>
+
 		<field
 			name="targetc"
 			type="list"
@@ -839,7 +1003,8 @@
 		<fieldset name="jmetadata"
 			label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
 
-			<field name="robots"
+			<field 
+				name="robots"
 				type="list"
 				label="JFIELD_METADATA_ROBOTS_LABEL"
 				description="JFIELD_METADATA_ROBOTS_DESC"
@@ -851,24 +1016,46 @@
 				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
 			</field>
 
-			<field name="author" type="text"
-				label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"
-				size="20" />
+			<field 
+				name="author" 
+				type="text"
+				label="JAUTHOR"
+				description="JFIELD_METADATA_AUTHOR_DESC"
+				size="20" 
+			/>
 
-			<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"
-				description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"
-				cols="30" rows="2" />
-			<field name="xreference" type="text"
+			<field 
+				name="rights" 
+				type="textarea" 
+				label="JFIELD_META_RIGHTS_LABEL"
+				description="JFIELD_META_RIGHTS_DESC" 
+				required="false" 
+				filter="string"
+				cols="30" 
+				rows="2" 
+			/>
+
+			<field 
+				name="xreference" 
+				type="text"
 				label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
 				description="COM_CONTENT_FIELD_XREFERENCE_DESC"
-				size="20" />
+				size="20" 
+			/>
 
 		</fieldset>
 	</fields>
 	<!-- These fields are used to get labels for the Content History Preview and Compare Views -->
 	<fields>
-		<field name="introtext" label="COM_CONTENT_FIELD_INTROTEXT" />
-		<field name="fulltext" label="COM_CONTENT_FIELD_FULLTEXT" />
+		<field 
+			name="introtext" 
+			label="COM_CONTENT_FIELD_INTROTEXT" 
+		/>
+
+		<field 
+			name="fulltext" 
+			label="COM_CONTENT_FIELD_FULLTEXT" 
+		/>
 	</fields>
 
 </form>
diff --git a/administrator/components/com_content/models/forms/filter_articles.xml b/administrator/components/com_content/models/forms/filter_articles.xml
index f8c297e4d7127..e41c8d0d5e00f 100644
--- a/administrator/components/com_content/models/forms/filter_articles.xml
+++ b/administrator/components/com_content/models/forms/filter_articles.xml
@@ -8,6 +8,7 @@
 			description="COM_CONTENT_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="published"
 			type="status"
@@ -17,17 +18,19 @@
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
+
 		<field
 			name="category_id"
 			type="category"
 			label="JOPTION_FILTER_CATEGORY"
-			extension="com_content"
 			description="JOPTION_FILTER_CATEGORY_DESC"
+			extension="com_content"
 			onchange="this.form.submit();"
 			published="0,1,2"
 			>
 			<option value="">JOPTION_SELECT_CATEGORY</option>
 		</field>
+
 		<field
 			name="access"
 			type="accesslevel"
@@ -37,15 +40,17 @@
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
+
 		<field
-                	name="author_id"
-                	type="author"
-                	label="COM_CONTENT_FILTER_AUTHOR"
-                	description="COM_CONTENT_FILTER_AUTHOR_DESC"
-                	onchange="this.form.submit();"
-                	>
-            		<option value="">JOPTION_SELECT_AUTHOR</option>
-        	</field>
+			name="author_id"
+			type="author"
+			label="COM_CONTENT_FILTER_AUTHOR"
+			description="COM_CONTENT_FILTER_AUTHOR_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_AUTHOR</option>	
+		</field>
+
 		<field
 			name="language"
 			type="contentlanguage"
@@ -56,30 +61,33 @@
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
 			<option value="*">JALL</option>
 		</field>
+
 		<field
 			name="tag"
 			type="tag"
-			mode="nested"
 			label="JOPTION_FILTER_TAG"
 			description="JOPTION_FILTER_TAG_DESC"
+			mode="nested"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_TAG</option>
 		</field>
-	        <field
-        	        name="level"
-        	        type="integer"
-        	        first="1"
-        	        last="10"
-        	        step="1"
-        	        label="JOPTION_FILTER_LEVEL"
-        	        languages="*"
-        	        description="JOPTION_FILTER_LEVEL_DESC"
-        	        onchange="this.form.submit();"
-        	        >
-        		<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
         	</field>
 	</fields>
+
 	<fields name="list">
 		<field
 			name="fullordering"
@@ -125,13 +133,14 @@
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
-			class="input-mini"
-			default="25"
 			label="COM_CONTENT_LIST_LIMIT"
 			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
 			onchange="this.form.submit();"
 		/>
 	</fields>
diff --git a/administrator/components/com_content/models/forms/filter_featured.xml b/administrator/components/com_content/models/forms/filter_featured.xml
index 2f7f1a9621a33..fe5b19b2a7155 100644
--- a/administrator/components/com_content/models/forms/filter_featured.xml
+++ b/administrator/components/com_content/models/forms/filter_featured.xml
@@ -8,6 +8,7 @@
 			description="COM_CONTENT_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="published"
 			type="status"
@@ -17,16 +18,18 @@
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
+
 		<field
 			name="category_id"
 			type="category"
 			label="JOPTION_FILTER_CATEGORY"
-			extension="com_content"
 			description="JOPTION_FILTER_CATEGORY_DESC"
+			extension="com_content"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_CATEGORY</option>
 		</field>
+
 		<field
 			name="access"
 			type="accesslevel"
@@ -36,15 +39,17 @@
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
+
 		<field
-                	name="author_id"
-                	type="author"
-                	label="COM_CONTENT_FILTER_AUTHOR"
-                	description="COM_CONTENT_FILTER_AUTHOR_DESC"
-                	onchange="this.form.submit();"
-                	>
-        		<option value="">JOPTION_SELECT_AUTHOR</option>
-        	</field>
+			name="author_id"
+			type="author"
+			label="COM_CONTENT_FILTER_AUTHOR"
+			description="COM_CONTENT_FILTER_AUTHOR_DESC"
+			onchange="this.form.submit();"
+			>
+  			<option value="">JOPTION_SELECT_AUTHOR</option>
+		</field>
+
 		<field
 			name="language"
 			type="contentlanguage"
@@ -55,30 +60,33 @@
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
 			<option value="*">JALL</option>
 		</field>
+
 		<field
 			name="tag"
 			type="tag"
-			mode="nested"
 			label="JOPTION_FILTER_TAG"
 			description="JOPTION_FILTER_TAG_DESC"
+			mode="nested"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_TAG</option>
 		</field>
-        	<field
-                	name="level"
-                	type="integer"
-                	first="1"
-                	last="10"
-                	step="1"
-                	label="JOPTION_FILTER_LEVEL"
-                	languages="*"
-                	description="JOPTION_FILTER_LEVEL_DESC"
-                	onchange="this.form.submit();"
-                	>
-        		<option value="">JOPTION_SELECT_MAX_LEVELS</option>
-        	</field>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+ 			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
 	</fields>
+
 	<fields name="list">
 		<field
 			name="fullordering"
@@ -118,13 +126,14 @@
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
-			class="input-mini"
-			default="25"
 			label="COM_CONTENT_LIST_LIMIT"
 			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
 			onchange="this.form.submit();"
 		/>
 	</fields>
diff --git a/administrator/components/com_fields/models/forms/field.xml b/administrator/components/com_fields/models/forms/field.xml
index c4ba27f22d8ee..0e2e105937d8c 100644
--- a/administrator/components/com_fields/models/forms/field.xml
+++ b/administrator/components/com_fields/models/forms/field.xml
@@ -4,9 +4,9 @@
 		<field
 			name="id"
 			type="text"
-			default="0"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
 			class="readonly"
 			readonly="true"
 		/>
@@ -27,7 +27,7 @@
 			type="fieldgroups"
 			label="COM_FIELDS_FIELD_GROUP_LABEL"
 			description="COM_FIELDS_FIELD_GROUP_DESC"
-		>
+			>
 			<option value="0">JNONE</option>
 		</field>
 
@@ -35,10 +35,10 @@
 			name="assigned_cat_ids"
 			type="category"
 			label="JCATEGORY"
-			extension="com_content"
 			description="JFIELD_FIELDS_CATEGORY_DESC"
+			extension="com_content"
 			multiple="true"
-		>
+			>
 			<option value="">JALL</option>
 		</field>
 
@@ -65,19 +65,19 @@
 			name="type"
 			type="type"
 			label="COM_FIELDS_FIELD_TYPE_LABEL"
-			default="text"
 			description="COM_FIELDS_FIELD_TYPE_DESC"
+			default="text"
 			required="true"
 		/>
 
 		<field
 			name="required"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_FIELDS_FIELD_REQUIRED_LABEL"
 			description="COM_FIELDS_FIELD_REQUIRED_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -85,20 +85,20 @@
 		<field
 			name="default_value"
 			type="textarea"
-			filter="raw"
 			label="COM_FIELDS_FIELD_DEFAULT_VALUE_LABEL"
 			description="COM_FIELDS_FIELD_DEFAULT_VALUE_DESC"
+			filter="raw"
 		/>
 
 		<field
 			name="state"
 			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
 			class="chzn-color-state"
 			default="1"
 			size="1"
-			label="JSTATUS"
-			description="JFIELD_PUBLISHED_DESC"
-		>
+			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 			<option value="2">JARCHIVED</option>
@@ -107,9 +107,9 @@
 
 		<field
 			name="buttonspacer"
+			type="spacer"
 			label="JGLOBAL_ACTION_PERMISSIONS_LABEL"
 			description="JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION"
-			type="spacer"
 		/>
 
 		<field
@@ -128,7 +128,7 @@
 			name="created_user_id"
 			type="user"
 			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
-			desc="JGLOBAL_FIELD_CREATED_BY_DESC"
+			description="JGLOBAL_FIELD_CREATED_BY_DESC"
 		/>
 
 		<field
@@ -163,7 +163,7 @@
 			type="contentlanguage"
 			label="JFIELD_LANGUAGE_LABEL"
 			description="COM_FIELDS_FIELD_LANGUAGE_DESC"
-		>
+			>
 			<option value="*">JALL</option>
 		</field>
 
@@ -189,8 +189,8 @@
 			name="description"
 			type="textarea"
 			label="JGLOBAL_DESCRIPTION"
-			size="40"
 			description="COM_FIELDS_FIELD_DESCRIPTION_DESC"
+			size="40"
 			filter="HTML"
 		/>
 
@@ -202,10 +202,10 @@
 		/>
 
 		<field
-			id="rules"
 			name="rules"
 			type="rules"
 			label="JFIELD_RULES_LABEL"
+			id="rules"
 			translate_label="false"
 			filter="rules"
 			validate="rules"
@@ -215,11 +215,12 @@
 		<field
 			name="ordering"
 			type="text"
-			class="inputbox"
 			label="JFIELD_ORDERING_LABEL"
 			description="JFIELD_ORDERING_DESC"
+			class="inputbox"
 		/>
 	</fieldset>
+
 	<fields name="params" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="basic">
 			<field
@@ -252,11 +253,11 @@
 			<field
 				name="showlabel"
 				type="radio"
-				class="btn-group btn-group-yesno"
-				default="1"
 				label="COM_FIELDS_FIELD_SHOWLABEL_LABEL"
 				description="COM_FIELDS_FIELD_SHOWLABEL_DESC"
-			>
+				class="btn-group btn-group-yesno"
+				default="1"
+				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
@@ -264,11 +265,11 @@
 			<field
 				name="show_on"
 				type="radio"
-				class="btn-group btn-group-yesno"
-				default=""
 				label="COM_FIELDS_FIELD_SHOW_ON_LABEL"
 				description="COM_FIELDS_FIELD_SHOW_ON_DESC"
-			>
+				class="btn-group btn-group-yesno"
+				default=""
+				>
 				<option value="1">COM_FIELDS_FIELD_SHOW_ON_SITE</option>
 				<option value="2">COM_FIELDS_FIELD_SHOW_ON_ADMIN</option>
 				<option value="">COM_FIELDS_FIELD_SHOW_ON_BOTH</option>
@@ -280,7 +281,7 @@
 				label="COM_FIELDS_FIELD_DISPLAY_LABEL"
 				description="COM_FIELDS_FIELD_DISPLAY_DESC"
 				default="2"
-			>
+				>
 				<option value="1">COM_FIELDS_FIELD_DISPLAY_AFTER_TITLE</option>
 				<option value="2">COM_FIELDS_FIELD_DISPLAY_BEFORE_DISPLAY</option>
 				<option value="3">COM_FIELDS_FIELD_DISPLAY_AFTER_DISPLAY</option>
diff --git a/administrator/components/com_fields/models/forms/filter_fields.xml b/administrator/components/com_fields/models/forms/filter_fields.xml
index be53abbe5cea9..aca47a63e508b 100644
--- a/administrator/components/com_fields/models/forms/filter_fields.xml
+++ b/administrator/components/com_fields/models/forms/filter_fields.xml
@@ -20,7 +20,7 @@
 			name="state"
 			type="status"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 
@@ -45,7 +45,7 @@
 			name="access"
 			type="accesslevel"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
 
@@ -53,7 +53,7 @@
 			name="language"
 			type="contentlanguage"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
 		</field>
 	</fields>
@@ -63,11 +63,11 @@
 			name="fullordering"
 			type="list"
 			label="JGLOBAL_SORT_BY"
-			statuses="*,0,1,2,-2"
 			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
 			default="a.ordering ASC"
-		>
+			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
 			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
@@ -90,9 +90,10 @@
 		<field
 			name="limit"
 			type="limitbox"
+			label="COM_FIELDS_LIST_LIMIT"
+			description="COM_FIELDS_LIST_LIMIT_DESC"
 			class="input-mini"
 			default="25"
-			label="COM_FIELDS_LIST_LIMIT" description="COM_FIELDS_LIST_LIMIT_DESC"
 			onchange="this.form.submit();"
 		/>
 	</fields>
diff --git a/administrator/components/com_fields/models/forms/group.xml b/administrator/components/com_fields/models/forms/group.xml
index d4e4e114368d3..575054f15fd23 100644
--- a/administrator/components/com_fields/models/forms/group.xml
+++ b/administrator/components/com_fields/models/forms/group.xml
@@ -41,7 +41,7 @@
 			description="JFIELD_PUBLISHED_DESC"
 			class="chzn-color-state"
 			default="1"
-		>
+			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 			<option value="2">JARCHIVED</option>
@@ -74,7 +74,7 @@
 			name="created_by"
 			type="user"
 			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
-			desc="JGLOBAL_FIELD_CREATED_BY_DESC"
+			description="JGLOBAL_FIELD_CREATED_BY_DESC"
 		/>
 
 		<field
@@ -89,7 +89,9 @@
 			filter="user_utc"
 		/>
 
-		<field name="modified_by" type="user"
+		<field 
+			name="modified_by" 
+			type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
@@ -130,10 +132,10 @@
 		/>
 
 		<field
-			id="rules"
 			name="rules"
 			type="rules"
 			label="JFIELD_RULES_LABEL"
+			id="rules"
 			translate_label="false"
 			filter="rules"
 			validate="rules"
@@ -143,9 +145,9 @@
 		<field
 			name="ordering"
 			type="text"
-			class="inputbox"
 			label="JFIELD_ORDERING_LABEL"
 			description="JFIELD_ORDERING_DESC"
+			class="inputbox"
 		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_finder/config.xml b/administrator/components/com_finder/config.xml
index 6c3e4491d6d81..4cbb94e58f8e0 100644
--- a/administrator/components/com_finder/config.xml
+++ b/administrator/components/com_finder/config.xml
@@ -7,170 +7,205 @@
 		<field
 			name="enabled"
 			type="radio"
+			label="COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL"
+			description="COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
-			label="COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL"
-			description="COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_DESCRIPTION">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="show_description"
 			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_DESCRIPTION_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_FINDER_CONFIG_SHOW_DESCRIPTION_LABEL"
-			description="COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESCRIPTION">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="description_length"
 			type="text"
+			label="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_LABEL"
+			description="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESCRIPTION" 
 			size="5"
 			default="255"
 			filter="integer"
-			label="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_LABEL"
-			description="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESCRIPTION" 
 			showon="show_description:1"
 		/>
-		<field name="allow_empty_query"
+
+		<field 
+			name="allow_empty_query"
 			type="radio"
+			label="COM_FINDER_CONFIG_ALLOW_EMPTY_QUERY_LABEL"
+			description="COM_FINDER_CONFIG_ALLOW_EMPTY_QUERY_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
-			label="COM_FINDER_CONFIG_ALLOW_EMPTY_QUERY_LABEL"
-			description="COM_FINDER_CONFIG_ALLOW_EMPTY_QUERY_DESCRIPTION">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="show_url"
 			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_URL_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_URL_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_FINDER_CONFIG_SHOW_URL_LABEL"
-			description="COM_FINDER_CONFIG_SHOW_URL_DESCRIPTION">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="show_autosuggest"
 			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_LABEL"
-			description="COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_DESCRIPTION">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
-		<field name="show_suggested_query"
+
+		<field 
+			name="show_suggested_query"
 			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
 			validate="options"
-			label="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_LABEL"
-			description="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
-		<field name="show_explained_query"
+
+		<field 
+			name="show_explained_query"
 			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
 			validate="options"
-			label="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_LABEL"
-			description="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="show_advanced"
 			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_ADVANCED_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_ADVANCED_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_FINDER_CONFIG_SHOW_ADVANCED_LABEL"
-			description="COM_FINDER_CONFIG_SHOW_ADVANCED_DESCRIPTION">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
-		<field name="show_advanced_tips"
+
+		<field 
+			name="show_advanced_tips"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_FINDER_CONFIG_SHOW_ADVANCED_TIPS_LABEL"
 			description="COM_FINDER_CONFIG_SHOW_ADVANCED_TIPS_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
 			showon="show_advanced:1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="expand_advanced"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_FINDER_CONFIG_EXPAND_ADVANCED_LABEL"
 			description="COM_FINDER_CONFIG_EXPAND_ADVANCED_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
 			showon="show_advanced:1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+	
 		<field
 			name="show_date_filters"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_LABEL"
 			description="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
 			showon="show_advanced:1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
-		<field name="sort_order"
+
+		<field 
+			name="sort_order"
 			type="list"
+			label="COM_FINDER_CONFIG_SORT_ORDER_LABEL"
+			description="COM_FINDER_CONFIG_SORT_ORDER_DESC"
 			default="relevance"
 			validate="options"
-			label="COM_FINDER_CONFIG_SORT_ORDER_LABEL"
-			description="COM_FINDER_CONFIG_SORT_ORDER_DESC">
+			>
 			<option value="relevance">COM_FINDER_CONFIG_SORT_OPTION_RELEVANCE</option>
 			<option value="date">COM_FINDER_CONFIG_SORT_OPTION_START_DATE</option>
 			<option value="price">COM_FINDER_CONFIG_SORT_OPTION_LIST_PRICE</option>
 		</field>
-		<field name="sort_direction"
+
+		<field 
+			name="sort_direction"
 			type="list"
+			label="COM_FINDER_CONFIG_SORT_DIRECTION_LABEL"
+			description="COM_FINDER_CONFIG_SORT_DIRECTION_DESC"
 			default="desc"
 			validate="options"
-			label="COM_FINDER_CONFIG_SORT_DIRECTION_LABEL"
-			description="COM_FINDER_CONFIG_SORT_DIRECTION_DESC">
+			>
 			<option value="desc">COM_FINDER_CONFIG_SORT_OPTION_DESCENDING</option>
 			<option value="asc">COM_FINDER_CONFIG_SORT_OPTION_ASCENDING</option>
 		</field>
+
 		<field
 			name="highlight_terms"
 			type="radio"
+			label="COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL"
+			description="COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL"
-			description="COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_DESCRIPTION">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="opensearch_name"
 			type="text"
 			label="COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_LABEL"
 			description="COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_DESCRIPTION"
 		/>
+
 		<field
 			name="opensearch_description"
 			type="textarea"
 			label="COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_LABEL"
 			description="COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_DESCRIPTION"
-			cols="30" rows="2"
+			cols="30" 
+			rows="2"
 		/>
 	</fieldset>
+
 	<fieldset
 		name="index"
 		label="COM_FINDER_FIELDSET_INDEX_OPTIONS_LABEL"
@@ -178,10 +213,11 @@
 		<field
 			name="batch_size"
 			type="list"
-			default="50"
 			label="COM_FINDER_CONFIG_BATCH_SIZE_LABEL"
 			description="COM_FINDER_CONFIG_BATCH_SIZE_DESCRIPTION"
-			validate="options" >
+			default="50"
+			validate="options" 
+			>
 			<option value="5">J5</option>
 			<option value="10">J10</option>
 			<option value="25">J25</option>
@@ -193,82 +229,100 @@
 			<option value="250">J250</option>
 			<option value="300">J300</option>
 		</field>
+
 		<field
 			name="memory_table_limit"
 			type="text"
-			size="10"
-			default="30000"
 			label="COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_LABEL"
 			description="COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_DESCRIPTION"
-			filter="integer" />
+			size="10"
+			default="30000"
+			filter="integer" 
+		/>
+
 		<field
 			name="title_multiplier"
 			type="text"
+			label="COM_FINDER_CONFIG_TITLE_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_TITLE_MULTIPLIER_DESCRIPTION"
 			size="5"
 			default="1.7"
-			label="COM_FINDER_CONFIG_TITLE_MULTIPLIER_LABEL"
-			description="COM_FINDER_CONFIG_TITLE_MULTIPLIER_DESCRIPTION" />
+		/>
+
 		<field
 			name="text_multiplier"
 			type="text"
+			label="COM_FINDER_CONFIG_TEXT_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_TEXT_MULTIPLIER_DESCRIPTION"
 			size="5"
 			default="0.7"
-			label="COM_FINDER_CONFIG_TEXT_MULTIPLIER_LABEL"
-			description="COM_FINDER_CONFIG_TEXT_MULTIPLIER_DESCRIPTION" />
+		/>
+
 		<field
 			name="meta_multiplier"
 			type="text"
+			label="COM_FINDER_CONFIG_META_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_META_MULTIPLIER_DESCRIPTION" 
 			size="5"
 			default="1.2"
-			label="COM_FINDER_CONFIG_META_MULTIPLIER_LABEL"
-			description="COM_FINDER_CONFIG_META_MULTIPLIER_DESCRIPTION" />
+		/>
+
 		<field
 			name="path_multiplier"
 			type="text"
+			label="COM_FINDER_CONFIG_PATH_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_PATH_MULTIPLIER_DESCRIPTION"
 			size="5"
 			default="2.0"
-			label="COM_FINDER_CONFIG_PATH_MULTIPLIER_LABEL"
-			description="COM_FINDER_CONFIG_PATH_MULTIPLIER_DESCRIPTION" />
+		/>
+
 		<field
 			name="misc_multiplier"
 			type="text"
+			label="COM_FINDER_CONFIG_MISC_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_MISC_MULTIPLIER_DESCRIPTION"
 			size="5"
 			default="0.3"
-			label="COM_FINDER_CONFIG_MISC_MULTIPLIER_LABEL"
-			description="COM_FINDER_CONFIG_MISC_MULTIPLIER_DESCRIPTION" />
+		/>
+
 		<field
 			name="stem"
 			type="radio"
+			label="COM_FINDER_CONFIG_STEMMER_ENABLE_LABEL"
+			description="COM_FINDER_CONFIG_STEMMER_ENABLE_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_FINDER_CONFIG_STEMMER_ENABLE_LABEL"
-			description="COM_FINDER_CONFIG_STEMMER_ENABLE_DESCRIPTION" >
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="stemmer"
 			type="list"
-			default="snowball"
 			label="COM_FINDER_CONFIG_STEMMER_LABEL"
 			description="COM_FINDER_CONFIG_STEMMER_DESCRIPTION"
+			default="snowball"
 			showon="stem:1" 
-		>
+			>
 			<option value="porter_en">COM_FINDER_CONFIG_STEMMER_PORTER_EN</option>
 			<option value="fr">COM_FINDER_CONFIG_STEMMER_FR</option>
 			<option value="snowball">COM_FINDER_CONFIG_STEMMER_SNOWBALL</option>
 		</field>
+
 		<field
 			name="enable_logging"
 			type="radio"
+			label="COM_FINDER_CONFIG_ENABLE_LOGGING_LABEL"
+			description="COM_FINDER_CONFIG_ENABLE_LOGGING_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
-			label="COM_FINDER_CONFIG_ENABLE_LOGGING_LABEL"
-			description="COM_FINDER_CONFIG_ENABLE_LOGGING_DESCRIPTION">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 	</fieldset>
+	
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
@@ -280,6 +334,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_finder"
-			section="component" />
+			section="component" 
+		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_finder/models/forms/filter.xml b/administrator/components/com_finder/models/forms/filter.xml
index b0a311e78ac4b..f281aa884712c 100644
--- a/administrator/components/com_finder/models/forms/filter.xml
+++ b/administrator/components/com_finder/models/forms/filter.xml
@@ -1,20 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset>
-		<field name="filter_id"  type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-			readonly="true"  />
+		<field 
+			name="filter_id"  
+			type="text" 
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC" 
+			class="readonly" 
+			size="10" 
+			default="0"
+			readonly="true"  
+		/>
 
-		<field name="title" type="text" label="JGLOBAL_TITLE"
-		       description="COM_FINDER_FILTER_TITLE_DESCRIPTION"
-		       class="input-xxlarge input-large-text"
-		       size="40"
-		       id="title"
-		       required="true" />
+		<field 
+			name="title" 
+			type="text" 
+			label="JGLOBAL_TITLE"
+			description="COM_FINDER_FILTER_TITLE_DESCRIPTION"
+			class="input-xxlarge input-large-text"
+			size="40"
+			id="title"
+			required="true" 
+		/>
 
-		<field name="alias" type="text" label="JFIELD_ALIAS_LABEL"
+		<field 
+			name="alias" 
+			type="text" 
+			label="JFIELD_ALIAS_LABEL"
 			description="JFIELD_ALIAS_DESC"
-			hint="JFIELD_ALIAS_PLACEHOLDER" size="45" />
+			hint="JFIELD_ALIAS_PLACEHOLDER" 
+			size="45" 
+		/>
 
 		<field
 			name="created"
@@ -30,9 +46,9 @@
 		<field
 			name="modified"
 			type="calendar"
-			class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL"
 			description="COM_FINDER_FIELD_MODIFIED_DESCRIPTION"
+			class="readonly"
 			translateformat="true"
 			showtime="true"
 			size="22"
@@ -40,38 +56,66 @@
 			filter="user_utc"
 		/>
 
-		<field name="created_by" type="user"
-			label="COM_FINDER_FIELD_CREATED_BY_LABEL" description="COM_FINDER_FIELD_CREATED_BY_DESC" />
+		<field 
+			name="created_by" 
+			type="user"
+			label="COM_FINDER_FIELD_CREATED_BY_LABEL" 
+			description="COM_FINDER_FIELD_CREATED_BY_DESC" 
+		/>
 
-		<field name="created_by_alias" type="text"
-			label="COM_FINDER_FIELD_CREATED_BY_ALIAS_LABEL" description="COM_FINDER_FIELD_CREATED_BY_ALIAS_DESC"
-			size="20" />
-		<field name="modified_by" type="user"
-		label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
-		class="readonly"
-		readonly="true"
-		filter="unset"
+		<field 
+			name="created_by_alias" 
+			type="text"
+			label="COM_FINDER_FIELD_CREATED_BY_ALIAS_LABEL" 
+			description="COM_FINDER_FIELD_CREATED_BY_ALIAS_DESC"
+			size="20" 
+		/>
+		
+		<field 
+			name="modified_by" 
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			class="readonly"
+			readonly="true"
+			filter="unset"
 		 />
 
-		<field name="checked_out" type="hidden" filter="unset" />
-
-		<field name="checked_out_time" type="hidden" filter="unset" />
+		<field 
+			name="checked_out" 
+			type="hidden" 
+			filter="unset" 
+		/>
 
+		<field 
+			name="checked_out_time" 
+			type="hidden" 
+			filter="unset" 
+		/>
 
-		<field name="state" type="list" label="JSTATUS"
+		<field 
+			name="state" 
+			type="list" 
+			label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC"
 			class="chzn-color-state"
-			filter="intval" size="1" default="1" >
-			<option value="1">
-				JPUBLISHED</option>
-			<option value="0">
-				JUNPUBLISHED</option>
+			filter="intval"
+			size="1"
+			default="1" 
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
 		</field>
 
 		<field
-			name="map_count" type="text" class="readonly"
-			label="COM_FINDER_FILTER_MAP_COUNT" description="COM_FINDER_FILTER_MAP_COUNT_DESCRIPTION"
-			size="10" default="0" readonly="true" />
+			name="map_count" 
+			type="text" 
+			label="COM_FINDER_FILTER_MAP_COUNT" 
+			description="COM_FINDER_FILTER_MAP_COUNT_DESCRIPTION"
+			class="readonly"
+			size="10" 
+			default="0" 
+			readonly="true" 
+		/>
 	</fieldset>
 
 	<fields name="params">
@@ -82,14 +126,16 @@
 				label="COM_FINDER_FILTER_WHEN_START_DATE_LABEL"
 				description="COM_FINDER_FILTER_WHEN_START_DATE_DESCRIPTION"
 				default=""
-				filter="string">
+				filter="string"
+				>
 				<option value="">JNONE</option>
 				<option value="-1">COM_FINDER_FILTER_WHEN_BEFORE</option>
 				<option value="0">COM_FINDER_FILTER_WHEN_EXACTLY</option>
 				<option value="1">COM_FINDER_FILTER_WHEN_AFTER</option>
 			</field>
 
-			<field name="d1"
+			<field 
+				name="d1"
 				type="calendar"
 				label="COM_FINDER_FILTER_START_DATE_LABEL"
 				description="COM_FINDER_FILTER_START_DATE_DESCRIPTION"
@@ -104,7 +150,8 @@
 				label="COM_FINDER_FILTER_WHEN_END_DATE_LABEL"
 				description="COM_FINDER_FILTER_WHEN_END_DATE_DESCRIPTION"
 				default=""
-				filter="string">
+				filter="string"
+				>
 				<option value="">JNONE</option>
 				<option value="-1">COM_FINDER_FILTER_WHEN_BEFORE</option>
 				<option value="0">COM_FINDER_FILTER_WHEN_EXACTLY</option>
diff --git a/administrator/components/com_finder/models/forms/filter_filters.xml b/administrator/components/com_finder/models/forms/filter_filters.xml
index f125a445c87e4..f5ea1528f992b 100644
--- a/administrator/components/com_finder/models/forms/filter_filters.xml
+++ b/administrator/components/com_finder/models/forms/filter_filters.xml
@@ -8,17 +8,19 @@
 			description="COM_FINDER_SEARCH_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="state"
 			type="status"
-			filter="0,1"
 			label="COM_FINDER_FILTER_PUBLISHED"
 			description="COM_FINDER_FILTER_PUBLISHED_DESC"
+			filter="0,1"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 	</fields>
+
 	<fields name="list">
 		<field
 			name="fullordering"
@@ -40,6 +42,7 @@
 			<option value="a.filter_id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.filter_id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
diff --git a/administrator/components/com_finder/models/forms/filter_index.xml b/administrator/components/com_finder/models/forms/filter_index.xml
index 5553ea52922d5..0e38017706479 100644
--- a/administrator/components/com_finder/models/forms/filter_index.xml
+++ b/administrator/components/com_finder/models/forms/filter_index.xml
@@ -8,6 +8,7 @@
 			description="COM_FINDER_INDEX_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="state"
 			type="status"
@@ -18,6 +19,7 @@
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
+
 		<field
 			name="type"
 			type="ContentTypes"
@@ -27,6 +29,7 @@
 			>
 			<option value="">COM_FINDER_MAPS_SELECT_TYPE</option>
 		</field>
+
 		<field
 			name="content_map"
 			type="ContentMap"
@@ -37,6 +40,7 @@
 			<option value="">COM_FINDER_FILTER_SELECT_CONTENT_MAP</option>
 		</field>
 	</fields>
+
 	<fields name="list">
 		<field
 			name="fullordering"
@@ -56,6 +60,7 @@
 			<option value="l.url ASC">COM_FINDER_INDEX_HEADING_LINK_URL_ASC</option>
 			<option value="l.url DESC">COM_FINDER_INDEX_HEADING_LINK_URL_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
diff --git a/administrator/components/com_finder/models/forms/filter_maps.xml b/administrator/components/com_finder/models/forms/filter_maps.xml
index afff43571fe2c..312d66aa9a85e 100644
--- a/administrator/components/com_finder/models/forms/filter_maps.xml
+++ b/administrator/components/com_finder/models/forms/filter_maps.xml
@@ -8,22 +8,25 @@
 			description="COM_FINDER_SEARCH_SEARCH_QUERY_DESC"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="state"
 			type="status"
-			filter="0,1"
 			label="COM_FINDER_FILTER_PUBLISHED"
 			description="COM_FINDER_FILTER_PUBLISHED_DESC"
+			filter="0,1"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
+
 		<field
 			name="branch"
 			type="branches"
 			default="0"
 			onchange="this.form.submit();"
 		/>
+
 		<field
 			name="level"
 			type="integer"
@@ -38,6 +41,7 @@
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
 	</fields>
+
 	<fields name="list">
 		<field
 			name="fullordering"
@@ -51,6 +55,7 @@
 			<option value="a.state ASC">JSTATUS_ASC</option>
 			<option value="a.state DESC">JSTATUS_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
diff --git a/administrator/components/com_installer/models/forms/filter_discover.xml b/administrator/components/com_installer/models/forms/filter_discover.xml
index 8f21ab2d8e954..b11e1f2dd4379 100644
--- a/administrator/components/com_installer/models/forms/filter_discover.xml
+++ b/administrator/components/com_installer/models/forms/filter_discover.xml
@@ -10,6 +10,7 @@
 			description="COM_INSTALLER_DISCOVER_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="client_id"
 			type="location"
@@ -17,6 +18,7 @@
 			>
 			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
 		</field>
+
 		<field
 			name="type"
 			type="type"
@@ -24,6 +26,7 @@
 			>
 			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
 		</field>
+
 		<field
 			name="folder"
 			type="folder"
@@ -32,6 +35,7 @@
 			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
 		</field>
 	</fields>
+
 	<fields name="list">
 		<field
 			name="fullordering"
@@ -53,6 +57,7 @@
 			<option value="extension_id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="extension_id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
diff --git a/administrator/components/com_installer/models/forms/filter_languages.xml b/administrator/components/com_installer/models/forms/filter_languages.xml
index 0b6f1167925a7..bf4211730915a 100644
--- a/administrator/components/com_installer/models/forms/filter_languages.xml
+++ b/administrator/components/com_installer/models/forms/filter_languages.xml
@@ -24,6 +24,7 @@
 			<option value="element ASC">COM_INSTALLER_HEADING_LANGUAGE_TAG_ASC</option>
 			<option value="element DESC">COM_INSTALLER_HEADING_LANGUAGE_TAG_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
diff --git a/administrator/components/com_installer/models/forms/filter_manage.xml b/administrator/components/com_installer/models/forms/filter_manage.xml
index befed4fc113e1..c6553e2e1b989 100644
--- a/administrator/components/com_installer/models/forms/filter_manage.xml
+++ b/administrator/components/com_installer/models/forms/filter_manage.xml
@@ -10,6 +10,7 @@
 			description="COM_INSTALLER_MANAGE_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="status"
 			type="extensionstatus"
@@ -19,6 +20,7 @@
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
+
 		<field
 			name="client_id"
 			type="location"
@@ -26,6 +28,7 @@
 			>
 			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
 		</field>
+
 		<field
 			name="type"
 			type="type"
@@ -33,6 +36,7 @@
 			>
 			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
 		</field>
+
 		<field
 			name="folder"
 			type="folder"
@@ -41,6 +45,7 @@
 			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
 		</field>
 	</fields>
+
 	<fields name="list">
 		<field
 			name="fullordering"
@@ -66,6 +71,7 @@
 			<option value="extension_id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="extension_id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
diff --git a/administrator/components/com_languages/config.xml b/administrator/components/com_languages/config.xml
index 5453162acf872..fb9bbac94a23d 100644
--- a/administrator/components/com_languages/config.xml
+++ b/administrator/components/com_languages/config.xml
@@ -13,12 +13,14 @@
 			filter="rules"
 			validate="rules"
 			component="com_languages"
-			section="component" />
+			section="component" 
+		/>
 
 		<field
 			type="hidden"
 			name="site"
 		/>
+
 		<field
 			type="hidden"
 			name="administrator"
diff --git a/administrator/components/com_languages/models/forms/language.xml b/administrator/components/com_languages/models/forms/language.xml
index 89b50cb9d8074..afe244ed84ab7 100644
--- a/administrator/components/com_languages/models/forms/language.xml
+++ b/administrator/components/com_languages/models/forms/language.xml
@@ -1,41 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset>
-		<field name="lang_id" type="text"
-			class="readonly"
-			description="JGLOBAL_FIELD_ID_DESC"
+		<field 
+			name="lang_id" 
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
 			default="0"
 			readonly="true"
 		/>
 
-		<field name="lang_code" type="text"
-			description="COM_LANGUAGES_FIELD_LANG_TAG_DESC"
+		<field 
+			name="lang_code" 
+			type="text"
 			label="COM_LANGUAGES_FIELD_LANG_TAG_LABEL"
+			description="COM_LANGUAGES_FIELD_LANG_TAG_DESC"
 			maxlength="7"
 			required="true"
 			size="10"
 		/>
 
-		<field name="title" type="text"
-			description="COM_LANGUAGES_FIELD_TITLE_DESC"
+		<field 
+			name="title"
+			type="text"
 			label="JGLOBAL_TITLE"
+			description="COM_LANGUAGES_FIELD_TITLE_DESC"
 			maxlength="50"
 			required="true"
 			size="40"
 		/>
 
-		<field name="title_native" type="text"
-			description="COM_LANGUAGES_FIELD_TITLE_NATIVE_DESC"
+		<field 
+			name="title_native"
+			type="text"
 			label="COM_LANGUAGES_FIELD_TITLE_NATIVE_LABEL"
+			description="COM_LANGUAGES_FIELD_TITLE_NATIVE_DESC"
 			maxlength="50"
 			required="true"
 			size="40"
 		/>
 
-		<field name="sef" type="text"
-			description="COM_LANGUAGES_FIELD_LANG_CODE_DESC"
+		<field 
+			name="sef" 
+			type="text"
 			label="COM_LANGUAGES_FIELD_LANG_CODE_LABEL"
+			description="COM_LANGUAGES_FIELD_LANG_CODE_DESC"
 			maxlength="50"
 			required="true"
 			size="10"
@@ -57,49 +67,61 @@
 			<option value="">JNONE</option>
 		</field>
 
-		<field name="description" type="textarea"
-			cols="80"
-			description="COM_LANGUAGES_FIELD_DESCRIPTION_DESC"
+		<field 
+			name="description" 
+			type="textarea"
 			label="JGLOBAL_DESCRIPTION"
+			description="COM_LANGUAGES_FIELD_DESCRIPTION_DESC"
+			cols="80"
 			rows="5"
 		/>
 
-		<field name="published" type="list"
-			default="1"
-			description="COM_LANGUAGES_FIELD_PUBLISHED_DESC"
+		<field 
+			name="published" 
+			type="list"
 			label="JSTATUS"
+			description="COM_LANGUAGES_FIELD_PUBLISHED_DESC"
+			default="1"
 			size="1"
-		>
+			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 			<option value="-2">JTRASHED</option>
 		</field>
 		
-		<field name="access" type="accesslevel"
-		size="1"
-		label="JFIELD_ACCESS_LABEL"
-		description="JFIELD_ACCESS_DESC"
+		<field 
+			name="access" 
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			size="1"
 		/>
 	</fieldset>
 	<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
-		<field name="metakey" type="textarea"
-			description="JFIELD_META_KEYWORDS_DESC"
+		<field 
+			name="metakey" 
+			type="textarea"
 			label="JFIELD_META_KEYWORDS_LABEL"
+			description="JFIELD_META_KEYWORDS_DESC"
 			rows="3"
 			cols="30"
 		/>
 
-		<field name="metadesc" type="textarea"
-			description="JFIELD_META_DESCRIPTION_DESC"
+		<field 
+			name="metadesc" 
+			type="textarea"
 			label="JFIELD_META_DESCRIPTION_LABEL"
+			description="JFIELD_META_DESCRIPTION_DESC"
 			rows="3"
 			cols="30"
 		/>
 	</fieldset>
 	<fieldset name="site_name" label="COM_LANGUAGES_FIELDSET_SITE_NAME_LABEL">
-		<field name="sitename" type="text"
-			description="COM_LANGUAGES_FIELD_SITE_NAME_DESC"
+		<field 
+			name="sitename" 
+			type="text"
 			label="COM_LANGUAGES_FIELD_SITE_NAME_LABEL"
+			description="COM_LANGUAGES_FIELD_SITE_NAME_DESC"
 			filter="string"
 			size="50"
 		/>
diff --git a/administrator/components/com_languages/models/forms/override.xml b/administrator/components/com_languages/models/forms/override.xml
index 954a6cb4c67fb..8d1a2ddb64e1d 100644
--- a/administrator/components/com_languages/models/forms/override.xml
+++ b/administrator/components/com_languages/models/forms/override.xml
@@ -8,7 +8,8 @@
 			description="COM_LANGUAGES_OVERRIDE_FIELD_KEY_DESC"
 			size="60"
 			required="true"
-			filter="LanguagesHelper::filterKey" />
+			filter="LanguagesHelper::filterKey" 
+		/>
 
 		<field
 			name="override"
@@ -17,7 +18,8 @@
 			description="COM_LANGUAGES_OVERRIDE_FIELD_OVERRIDE_DESC"
 			cols="50"
 			rows="5"
-			filter="LanguagesHelper::filterText" />
+			filter="LanguagesHelper::filterText" 
+		/>
 
 		<field
 			name="both"
@@ -25,26 +27,31 @@
 			label="COM_LANGUAGES_OVERRIDE_FIELD_BOTH_LABEL"
 			description="COM_LANGUAGES_OVERRIDE_FIELD_BOTH_DESC"
 			value="true"
-			filter="boolean" />
+			filter="boolean" 
+		/>
 
 		<field
 			name="searchstring"
 			type="text"
 			label="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_LABEL"
 			description="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_DESC"
-			size="50" />
+			size="50"
+		/>
 
 		<field
 			name="searchtype"
 			type="list"
 			label="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_LABEL"
 			description="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_DESC"
-			default="value">
+			default="value"
+			>
 			<option value="constant">COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_CONSTANT</option>
 			<option value="value">COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_TEXT</option>
 		</field>
 
-		<field name="language" type="text"
+		<field 
+			name="language" 
+			type="text"
 			label="COM_LANGUAGES_OVERRIDE_FIELD_LANGUAGE_LABEL"
 			description="COM_LANGUAGES_OVERRIDE_FIELD_LANGUAGE_DESC"
 			filter="unset"
@@ -53,7 +60,9 @@
 			size="50"
 		/>
 
-		<field name="client" type="text"
+		<field 
+			name="client" 
+			type="text"
 			label="COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_LABEL"
 			description="COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_DESC"
 			filter="unset"
@@ -62,7 +71,9 @@
 			size="50"
 		/>
 
-		<field name="file" type="text"
+		<field 
+			name="file" 
+			type="text"
 			label="COM_LANGUAGES_OVERRIDE_FIELD_FILE_LABEL"
 			description="COM_LANGUAGES_OVERRIDE_FIELD_FILE_DESC"
 			filter="unset"
@@ -73,6 +84,7 @@
 
 		<field
 			name="id"
-			type="hidden" />
+			type="hidden"
+		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_media/config.xml b/administrator/components/com_media/config.xml
index f3ca4c4eec3a0..6ef06cfff1e74 100644
--- a/administrator/components/com_media/config.xml
+++ b/administrator/components/com_media/config.xml
@@ -6,46 +6,54 @@
 		<field
 			name="upload_extensions"
 			type="text"
+			label="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL"
+			description="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC"
 			size="50"
 			default="bmp,csv,doc,gif,ico,jpg,jpeg,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,BMP,CSV,DOC,GIF,ICO,JPG,JPEG,ODG,ODP,ODS,ODT,PDF,PNG,PPT,TXT,XCF,XLS"
-			label="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL"
-			description="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC" />
+		/>
 
 		<field
 			name="upload_maxsize"
 			type="text"
+			label="COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL"
+			description="COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC" 
 			size="50"
 			default="10"
-			label="COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL"
-			description="COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC" />
+		/>
 
-		<field name="spacer1" type="spacer" class="text"
+		<field
+			name="spacer1" 
+			type="spacer" 
 			label="COM_MEDIA_FOLDERS_PATH_LABEL"
+			class="text"
 		/>
 
 		<field
 			name="file_path"
 			type="text"
+			label="COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL"
+			description="COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC" 
 			size="50"
 			default="images"
-			label="COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL"
-			description="COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC" />
+		/>
 
 		<field
 			name="image_path"
 			type="text"
+			label="COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL"
+			description="COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC"
 			size="50"
 			default="images"
-			label="COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL"
-			description="COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC" />
+		/>
 
 		<field
 			name="restrict_uploads"
 			type="radio"
+			label="COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL"
+			description="COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL"
-			description="COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -53,10 +61,11 @@
 		<field
 			name="check_mime"
 			type="radio"
+			label="COM_MEDIA_FIELD_CHECK_MIME_LABEL"
+			description="COM_MEDIA_FIELD_CHECK_MIME_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_MEDIA_FIELD_CHECK_MIME_LABEL"
-			description="COM_MEDIA_FIELD_CHECK_MIME_DESC">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -64,33 +73,37 @@
 		<field
 			name="image_extensions"
 			type="text"
+			label="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL"
+			description="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC"
 			size="50"
 			default="bmp,gif,jpg,png"
-			label="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL"
-			description="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC" />
+		/>
 
 		<field
 			name="ignore_extensions"
 			type="text"
-			size="50"
 			label="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL"
-			description="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC" />
+			description="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC" 
+			size="50"
+		/>
 
 		<field
 			name="upload_mime"
 			type="text"
+			label="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL"
+			description="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC"
 			size="50"
 			default="image/jpeg,image/gif,image/png,image/bmp,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip"
-			label="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL"
-			description="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC" />
+		/>
 
 		<field
 			name="upload_mime_illegal"
 			type="text"
+			label="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL"
+			description="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC"
 			size="50"
 			default="text/html"
-			label="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL"
-			description="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC" />
+		 />
 	</fieldset>
 
 	<fieldset
@@ -106,6 +119,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_media"
-			section="component" />
+			section="component"
+		 />
 	</fieldset>
 </config>
diff --git a/administrator/components/com_menus/models/forms/filter_items.xml b/administrator/components/com_menus/models/forms/filter_items.xml
index f21b45a6cc630..2e6e14f3906b1 100644
--- a/administrator/components/com_menus/models/forms/filter_items.xml
+++ b/administrator/components/com_menus/models/forms/filter_items.xml
@@ -6,7 +6,7 @@
 		label=""
 		filtermode="selector"
 		onchange="this.form.submit();"
-	>
+		>
 		<option value="0">JSITE</option>
 		<option value="1">JADMINISTRATOR</option>
 	</field>
diff --git a/administrator/components/com_menus/models/forms/filter_itemsadmin.xml b/administrator/components/com_menus/models/forms/filter_itemsadmin.xml
index afad9341a4d21..d31482bd0584e 100644
--- a/administrator/components/com_menus/models/forms/filter_itemsadmin.xml
+++ b/administrator/components/com_menus/models/forms/filter_itemsadmin.xml
@@ -6,10 +6,11 @@
 		label=""
 		filtermode="selector"
 		onchange="this.form.submit();"
-	>
+		>
 		<option value="0">JSITE</option>
 		<option value="1">JADMINISTRATOR</option>
 	</field>
+
 	<field
 		name="menutype"
 		type="menu"
diff --git a/administrator/components/com_menus/models/forms/filter_menus.xml b/administrator/components/com_menus/models/forms/filter_menus.xml
index 58842a644d03f..1d5cdefd7c3fe 100644
--- a/administrator/components/com_menus/models/forms/filter_menus.xml
+++ b/administrator/components/com_menus/models/forms/filter_menus.xml
@@ -6,7 +6,7 @@
 		label=""
 		filtermode="selector"
 		onchange="this.form.submit();"
-	>
+		>
 		<option value="0">JSITE</option>
 		<option value="1">JADMINISTRATOR</option>
 	</field>
diff --git a/administrator/components/com_menus/models/forms/item.xml b/administrator/components/com_menus/models/forms/item.xml
index a48fb0282efe3..456723682a3be 100644
--- a/administrator/components/com_menus/models/forms/item.xml
+++ b/administrator/components/com_menus/models/forms/item.xml
@@ -19,7 +19,8 @@
 			description="COM_MENUS_ITEM_FIELD_TITLE_DESC"
 			class="input-xxlarge input-large-text"
 			size="40"
-			required="true"/>
+			required="true"
+		/>
 
 		<field
 			name="alias"
@@ -27,7 +28,8 @@
 			label="JFIELD_ALIAS_LABEL"
 			description="JFIELD_ALIAS_DESC"
 			hint="JFIELD_ALIAS_PLACEHOLDER"
-			size="40"/>
+			size="40"
+		/>
 
 		<field
 			name="note"
@@ -36,7 +38,8 @@
 			description="COM_MENUS_ITEM_FIELD_NOTE_DESC"
 			maxlength="255"
 			class="span12"
-			size="40"/>
+			size="40"
+		/>
 
 		<field
 			name="link"
@@ -45,7 +48,8 @@
 			description="COM_MENUS_ITEM_FIELD_LINK_DESC"
 			readonly="true"
 			class="input-xxlarge"
-			size="50"/>
+			size="50"
+		/>
 
 		<field
 			name="menutype"
@@ -66,28 +70,23 @@
 			description="COM_MENUS_ITEM_FIELD_TYPE_DESC"
 			class="input-medium"
 			required="true"
-			size="40" />
+			size="40" 
+		/>
 
 		<field
 			name="published"
 			type="list"
-			class="chzn-color-state"
-			id="published"
 			label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC"
+			id="published"
+			class="chzn-color-state"
 			size="1"
 			default="1"
-			filter="integer">
-			<option
-				value="1">
-				JPUBLISHED</option>
-			<option
-				value="0">
-				JUNPUBLISHED</option>
-
-			<option
-				value="-2">
-				JTRASHED</option>
+			filter="integer"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="-2">JTRASHED</option>
 		</field>
 
 		<field
@@ -98,9 +97,9 @@
 			default="1"
 			filter="int"
 			clientid="0"
-			size="1">
-			<option
-				value="1">COM_MENUS_ITEM_ROOT</option>
+			size="1"
+			>
+			<option value="1">COM_MENUS_ITEM_ROOT</option>
 		</field>
 
 		<field
@@ -115,7 +114,8 @@
 		<field
 			name="component_id"
 			type="hidden"
-			filter="int" />
+			filter="int"
+		/>
 
 		<field
 			name="browserNav"
@@ -125,19 +125,19 @@
 			default="0"
 			filter="int"
 			>
-				<option value="0">COM_MENUS_FIELD_VALUE_PARENT</option>
-				<option value="1">COM_MENUS_FIELD_VALUE_NEW_WITH_NAV</option>
-				<option value="2">COM_MENUS_FIELD_VALUE_NEW_WITHOUT_NAV</option>
-			</field>
+			<option value="0">COM_MENUS_FIELD_VALUE_PARENT</option>
+			<option value="1">COM_MENUS_FIELD_VALUE_NEW_WITH_NAV</option>
+			<option value="2">COM_MENUS_FIELD_VALUE_NEW_WITHOUT_NAV</option>
+		</field>
 
 		<field
 			name="access"
 			type="accesslevel"
-			id="access"
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
-			filter="integer"/>
-
+			id="access"
+			filter="integer"
+			/>
 
 		<field
 			name="template_style_id"
@@ -157,7 +157,8 @@
 			description="COM_MENUS_ITEM_FIELD_HOME_DESC"
 			default="0"
 			class="btn-group btn-group-yesno"
-			filter="integer">
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -174,32 +175,38 @@
 		<field
 			name="path"
 			type="hidden"
-			filter="unset"/>
+			filter="unset"
+		/>
 
 		<field
 			name="level"
 			type="hidden"
-			filter="unset"/>
+			filter="unset"
+		/>
 
 		<field
 			name="checked_out"
 			type="hidden"
-			filter="unset"/>
+			filter="unset"
+		/>
 
 		<field
 			name="checked_out_time"
 			type="hidden"
-			filter="unset"/>
+			filter="unset"
+		/>
 
 		<field
 			name="lft"
 			type="hidden"
-			filter="unset"/>
+			filter="unset"
+		/>
 
 		<field
 			name="rgt"
 			type="hidden"
-			filter="unset"/>
+			filter="unset"
+		/>
 
 		<field
 			name="toggle_modules_assigned"
@@ -208,7 +215,8 @@
 			description="COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_DESC"
 			default="1"
 			class="btn-group btn-group-yesno"
-			filter="integer">
+			filter="integer"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -220,7 +228,8 @@
 			description="COM_MENUS_ITEM_FIELD_HIDE_UNPUBLISHED_DESC"
 			default="1"
 			class="btn-group btn-group-yesno"
-			filter="integer">
+			filter="integer"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
diff --git a/administrator/components/com_menus/models/forms/item_alias.xml b/administrator/components/com_menus/models/forms/item_alias.xml
index abde0417f2707..61879dbe4c08d 100644
--- a/administrator/components/com_menus/models/forms/item_alias.xml
+++ b/administrator/components/com_menus/models/forms/item_alias.xml
@@ -5,9 +5,11 @@
 	<fields name="params">
 
 		<fieldset name="aliasoptions">
-			<field name="aliasoptions" type="modal_menu"
-				description="COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC"
+			<field 
+				name="aliasoptions" 
+				type="modal_menu"
 				label="COM_MENUS_ITEM_FIELD_ALIAS_MENU_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC"
 				clientid="0"
 				required="true"
 				select="true"
@@ -21,35 +23,48 @@
 				label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
 			>
 
-			<field name="menu-anchor_title" type="text"
+			<field 
+				name="menu-anchor_title" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
 
-			<field name="menu-anchor_css" type="text"
+			<field 
+				name="menu-anchor_css" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" />
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
 
-			<field name="menu_image" type="media"
+			<field 
+				name="menu_image" 
+				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
 
-			<field name="menu_text" type="radio"
-				class="btn-group btn-group-yesno"
+			<field 
+				name="menu_text" 
+				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
-				default="1" filter="integer"
-			>
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
 				default="1"
 				filter="integer"
+				class="btn-group btn-group-yesno"
 				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
diff --git a/administrator/components/com_menus/models/forms/item_component.xml b/administrator/components/com_menus/models/forms/item_component.xml
index 3c6541b86d815..7cd48ab404560 100644
--- a/administrator/components/com_menus/models/forms/item_component.xml
+++ b/administrator/components/com_menus/models/forms/item_component.xml
@@ -2,37 +2,47 @@
 <form>
 	<fields name="params" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
 	>
-		<fieldset name="menu-options"
-			label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
-		>
+		<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
 
-			<field name="menu-anchor_title" type="text"
+			<field 
+				name="menu-anchor_title" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
 
-			<field name="menu-anchor_css" type="text"
+			<field 
+				name="menu-anchor_css" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" />
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
 
-			<field name="menu_image" type="media"
+			<field
+				name="menu_image" 
+				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
 
-			<field name="menu_text" type="radio"
-				class="btn-group btn-group-yesno"
+			<field 
+				name="menu_text" 
+				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
 				default="1" filter="integer"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
 				>
@@ -82,37 +92,49 @@
 
 		</fieldset>
 
-		<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS"
-		>
-			<field name="menu-meta_description" type="textarea"
-				label="JFIELD_META_DESCRIPTION_LABEL" description="JFIELD_META_DESCRIPTION_DESC"
-				rows="3" cols="40" />
-
-			<field name="menu-meta_keywords" type="textarea"
-				label="JFIELD_META_KEYWORDS_LABEL" description="JFIELD_META_KEYWORDS_DESC"
-				rows="3" cols="40" />
-
-			<field name="robots"
-			type="list"
-			label="JFIELD_METADATA_ROBOTS_LABEL"
-			description="JFIELD_METADATA_ROBOTS_DESC"
-			>
-			<option value="">JGLOBAL_USE_GLOBAL</option>
-			<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
-			<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
-			<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
-			<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
-		</field>
-
-			<field name="secure" type="list"
-				label="COM_MENUS_ITEM_FIELD_SECURE_LABEL" description="COM_MENUS_ITEM_FIELD_SECURE_DESC"
-				default="0" filter="integer"
-			>
+		<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+			<field 
+				name="menu-meta_description" 
+				type="textarea"
+				label="JFIELD_META_DESCRIPTION_LABEL" 
+				description="JFIELD_META_DESCRIPTION_DESC"
+				rows="3" 
+				cols="40" 
+			/>
+
+			<field 
+				name="menu-meta_keywords" 
+				type="textarea"
+				label="JFIELD_META_KEYWORDS_LABEL" 
+				description="JFIELD_META_KEYWORDS_DESC"
+				rows="3" 
+				cols="40" 
+			/>
+
+			<field 
+				name="robots"
+				type="list"
+				label="JFIELD_METADATA_ROBOTS_LABEL"
+				description="JFIELD_METADATA_ROBOTS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+			</field>
+
+			<field 
+				name="secure" 
+				type="list"
+				label="COM_MENUS_ITEM_FIELD_SECURE_LABEL" 
+				description="COM_MENUS_ITEM_FIELD_SECURE_DESC"
+				default="0" 
+				filter="integer"
+				>
 				<option value="-1">JOFF</option>
 				<option value="1">JON</option>
-				<option value="0">COM_MENUS_FIELD_VALUE_IGNORE
-				</option>
-
+				<option value="0">COM_MENUS_FIELD_VALUE_IGNORE</option>
 			</field>
 		</fieldset>
 
diff --git a/administrator/components/com_menus/models/forms/item_heading.xml b/administrator/components/com_menus/models/forms/item_heading.xml
index 4ca0bf93b2cac..d421de20eeaea 100644
--- a/administrator/components/com_menus/models/forms/item_heading.xml
+++ b/administrator/components/com_menus/models/forms/item_heading.xml
@@ -4,33 +4,46 @@
 		<fieldset name="menu-options"
 			label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
 		>
-			<field name="menu-anchor_title" type="text"
+			<field 
+				name="menu-anchor_title" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
 
-			<field name="menu-anchor_css" type="text"
+			<field 
+				name="menu-anchor_css" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" />
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
 
-			<field name="menu_image" type="media"
+			<field 
+				name="menu_image" 
+				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
 
-			<field name="menu_text" type="radio"
-				class="btn-group btn-group-yesno"
+			<field 
+				name="menu_text" 
+				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
-				default="1" filter="integer"
-			>
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
 				>
diff --git a/administrator/components/com_menus/models/forms/item_separator.xml b/administrator/components/com_menus/models/forms/item_separator.xml
index 67bfe0e48ed27..4e747c1a06887 100644
--- a/administrator/components/com_menus/models/forms/item_separator.xml
+++ b/administrator/components/com_menus/models/forms/item_separator.xml
@@ -5,29 +5,39 @@
 			label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
 		>
 
-			<field name="menu-anchor_css" type="text"
+			<field 
+				name="menu-anchor_css" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" />
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
 
-			<field name="menu_image" type="media"
+			<field 
+				name="menu_image" 
+				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
 
-			<field name="menu_text" type="radio"
-				class="btn-group btn-group-yesno"
+			<field 
+				name="menu_text" 
+				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
-				default="1" filter="integer"
-			>
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
 				>
diff --git a/administrator/components/com_menus/models/forms/item_url.xml b/administrator/components/com_menus/models/forms/item_url.xml
index b6307cc4027e0..8f68880cd845c 100644
--- a/administrator/components/com_menus/models/forms/item_url.xml
+++ b/administrator/components/com_menus/models/forms/item_url.xml
@@ -4,19 +4,27 @@
 		<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
 		>
 
-			<field name="menu-anchor_title"
-				type="text" label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" />
+			<field 
+				name="menu-anchor_title"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
 
-			<field name="menu-anchor_css"
-				type="text" label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" />
+			<field 
+				name="menu-anchor_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
 
-			<field name="menu-anchor_rel" type="list"
+			<field 
+				name="menu-anchor_rel" 
+				type="list"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_REL_LABEL"
 				description="COM_MENUS_ITEM_FIELD_ANCHOR_REL_DESC"
 				default=""
-			>
+				>
 				<option value="">JNONE</option>
 				<option value="alternate"/>
 				<option value="author"/>
@@ -32,25 +40,32 @@
 				<option value="tag"/>
 			</field>
 
-			<field name="menu_image" type="media"
+			<field 
+				name="menu_image" 
+				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
 
-			<field name="menu_text" type="radio"
-				class="btn-group btn-group-yesno"
+			<field 
+				name="menu_text" 
+				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
-				default="1" filter="integer"
-			>
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
 				>
diff --git a/administrator/components/com_menus/models/forms/itemadmin.xml b/administrator/components/com_menus/models/forms/itemadmin.xml
index 29f3ffd2ce3c8..4ef196c7b9dbf 100644
--- a/administrator/components/com_menus/models/forms/itemadmin.xml
+++ b/administrator/components/com_menus/models/forms/itemadmin.xml
@@ -19,7 +19,8 @@
 			description="COM_MENUS_ITEM_FIELD_TITLE_DESC"
 			class="input-xxlarge input-large-text"
 			size="40"
-			required="true"/>
+			required="true"
+		/>
 
 		<field
 			name="alias"
@@ -58,7 +59,7 @@
 			required="true"
 			clientid="1"
 			size="1"
-		>
+			>
 			<option value="">COM_MENUS_SELECT_MENU</option>
 		</field>
 
@@ -75,13 +76,14 @@
 		<field
 			name="published"
 			type="list"
-			class="chzn-color-state"
-			id="published"
 			label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC"
+			class="chzn-color-state"
+			id="published"
 			size="1"
 			default="1"
-			filter="integer">
+			filter="integer"
+			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 			<option value="-2">JTRASHED</option>
@@ -95,7 +97,8 @@
 			default="1"
 			filter="int"
 			clientid="1"
-			size="1">
+			size="1"
+			>
 			<option value="1">COM_MENUS_ITEM_ROOT</option>
 		</field>
 
@@ -105,8 +108,8 @@
 			label="COM_MENUS_ITEM_FIELD_ORDERING_LABEL"
 			description="COM_MENUS_ITEM_FIELD_ORDERING_DESC"
 			filter="int"
-			size="1">
-		</field>
+			size="1"
+		/>
 
 		<field
 			name="component_id"
@@ -121,7 +124,7 @@
 			description="COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC"
 			default="0"
 			filter="int"
-		>
+			>
 			<option value="0">COM_MENUS_FIELD_VALUE_PARENT</option>
 			<option value="1">COM_MENUS_FIELD_VALUE_NEW_WITH_NAV</option>
 		</field>
diff --git a/administrator/components/com_menus/models/forms/itemadmin_alias.xml b/administrator/components/com_menus/models/forms/itemadmin_alias.xml
index 66e4aebe774a2..7e9577ad575f3 100644
--- a/administrator/components/com_menus/models/forms/itemadmin_alias.xml
+++ b/administrator/components/com_menus/models/forms/itemadmin_alias.xml
@@ -6,8 +6,8 @@
 			<field
 				name="aliasoptions"
 				type="modal_menu"
-				description="COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC"
 				label="COM_MENUS_ITEM_FIELD_ALIAS_MENU_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC"
 				clientid="1"
 				required="true"
 				select="true"
@@ -46,23 +46,25 @@
 			<field
 				name="menu_text"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
-				default="1" filter="integer"
-			>
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
diff --git a/administrator/components/com_menus/models/forms/itemadmin_component.xml b/administrator/components/com_menus/models/forms/itemadmin_component.xml
index 78741817a4869..3ebe45d3e0037 100644
--- a/administrator/components/com_menus/models/forms/itemadmin_component.xml
+++ b/administrator/components/com_menus/models/forms/itemadmin_component.xml
@@ -5,33 +5,46 @@
 			label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
 		>
 
-			<field name="menu-anchor_title" type="text"
+			<field 
+				name="menu-anchor_title" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
 
-			<field name="menu-anchor_css" type="text"
+			<field
+				name="menu-anchor_css" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" />
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
 
-			<field name="menu_image" type="media"
+			<field 
+				name="menu_image" 
+				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
 
-			<field name="menu_text" type="radio"
-				class="btn-group btn-group-yesno"
+			<field 
+				name="menu_text" 
+				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
-				default="1" filter="integer"
-			>
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
 				>
diff --git a/administrator/components/com_menus/models/forms/itemadmin_container.xml b/administrator/components/com_menus/models/forms/itemadmin_container.xml
index e3dfffbb03996..077a3b5d48d33 100644
--- a/administrator/components/com_menus/models/forms/itemadmin_container.xml
+++ b/administrator/components/com_menus/models/forms/itemadmin_container.xml
@@ -40,12 +40,12 @@
 			<field
 				name="menu_text"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
@@ -53,12 +53,12 @@
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
diff --git a/administrator/components/com_menus/models/forms/itemadmin_heading.xml b/administrator/components/com_menus/models/forms/itemadmin_heading.xml
index 57ce1e625d4cd..48346ba931324 100644
--- a/administrator/components/com_menus/models/forms/itemadmin_heading.xml
+++ b/administrator/components/com_menus/models/forms/itemadmin_heading.xml
@@ -40,12 +40,12 @@
 			<field
 				name="menu_text"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
@@ -53,12 +53,12 @@
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
diff --git a/administrator/components/com_menus/models/forms/itemadmin_url.xml b/administrator/components/com_menus/models/forms/itemadmin_url.xml
index 5eba70717831c..87b4c78285e43 100644
--- a/administrator/components/com_menus/models/forms/itemadmin_url.xml
+++ b/administrator/components/com_menus/models/forms/itemadmin_url.xml
@@ -2,19 +2,27 @@
 <form>
 	<fields name="params">
 		<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
-			<field name="menu-anchor_title"
-				type="text" label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" />
+			<field 
+				name="menu-anchor_title"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
 
-			<field name="menu-anchor_css"
-				type="text" label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
-				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" />
+			<field 
+				name="menu-anchor_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
 
-			<field name="menu-anchor_rel" type="list"
+			<field 
+				name="menu-anchor_rel" 
+				type="list"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_REL_LABEL"
 				description="COM_MENUS_ITEM_FIELD_ANCHOR_REL_DESC"
 				default=""
-			>
+				>
 				<option value="">JNONE</option>
 				<option value="alternate"/>
 				<option value="author"/>
@@ -30,25 +38,31 @@
 				<option value="tag"/>
 			</field>
 
-			<field name="menu_image" type="media"
+			<field 
+				name="menu_image" 
+				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
 
-			<field name="menu_text" type="radio"
-				class="btn-group btn-group-yesno"
+			<field 
+				name="menu_text" 
+				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
 				default="1" filter="integer"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="menu_show"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
 				default="1"
 				filter="integer"
 				>
diff --git a/administrator/components/com_menus/models/forms/menu.xml b/administrator/components/com_menus/models/forms/menu.xml
index 155cbe6071908..7db713f400f60 100644
--- a/administrator/components/com_menus/models/forms/menu.xml
+++ b/administrator/components/com_menus/models/forms/menu.xml
@@ -2,9 +2,9 @@
 <form>
 	<fieldset>
 		<field
-			id="id"
 			name="id"
 			type="hidden"
+			id="id"
 			default="0"
 			filter="int"
 			readonly="true"
@@ -15,44 +15,44 @@
 			filter="unset"
 		/>
 		<field
-			id="menutype"
 			name="menutype"
 			type="text"
 			label="COM_MENUS_MENU_MENUTYPE_LABEL"
 			description="COM_MENUS_MENU_MENUTYPE_DESC"
+			id="menutype"
 			size="30"
 			maxlength="24"
 			required="true"
 		/>
 		<field
-			id="title"
 			name="title"
 			type="text"
 			label="JGLOBAL_TITLE"
 			description="COM_MENUS_MENU_TITLE_DESC"
+			id="title"
 			size="30"
 			maxlength="48"
 			required="true"
 		/>
 		<field
-			id="menudescription"
 			name="description"
 			type="text"
 			label="JGLOBAL_DESCRIPTION"
 			description="COM_MENUS_MENU_DESCRIPTION_DESC"
+			id="menudescription"
 			size="30"
 			maxlength="255"
 		/>
 		<field
-			id="client_id"
 			name="client_id"
 			type="radio"
 			label="COM_MENUS_MENU_CLIENT_ID_LABEL"
 			description="COM_MENUS_MENU_CLIENT_ID_DESC"
+			id="client_id"
 			default="0"
 			class="btn-group btn-group-yesno btn-group-reversed"
 			required="true"
-		>
+			>
 			<option value="0">JSITE</option>
 			<option value="1">JADMINISTRATOR</option>
 		</field>
@@ -64,7 +64,7 @@
 			filter="rules"
 			component="com_menus"
 			section="menu"
-			validate="rules" />
-
+			validate="rules" 
+		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_menus/views/item/tmpl/edit.xml b/administrator/components/com_menus/views/item/tmpl/edit.xml
index d1408e7e1b3e0..cd8bb713629ec 100755
--- a/administrator/components/com_menus/views/item/tmpl/edit.xml
+++ b/administrator/components/com_menus/views/item/tmpl/edit.xml
@@ -13,7 +13,7 @@
 				label="COM_MENUS_ITEMS_CHOOSE_MENU_LABEL"
 				description="COM_MENUS_ITEMS_CHOOSE_MENU_DESC"
 				clientid=""
-			>
+				>
 				<option value="">COM_MENUS_SELECT_MENU</option>
 			</field>
 		</fields>
diff --git a/administrator/components/com_menus/views/items/tmpl/default.xml b/administrator/components/com_menus/views/items/tmpl/default.xml
index 24144a99341b2..f584706cfcd0c 100755
--- a/administrator/components/com_menus/views/items/tmpl/default.xml
+++ b/administrator/components/com_menus/views/items/tmpl/default.xml
@@ -13,7 +13,7 @@
 				label="COM_MENUS_ITEMS_CHOOSE_MENU_LABEL"
 				description="COM_MENUS_ITEMS_CHOOSE_MENU_DESC"
 				clientid=""
-			>
+				>
 				<option value="">COM_MENUS_SELECT_MENU</option>
 			</field>
 		</fields>
diff --git a/administrator/components/com_messages/config.xml b/administrator/components/com_messages/config.xml
index 38c31c0719aa1..ddb9b37b8cecd 100644
--- a/administrator/components/com_messages/config.xml
+++ b/administrator/components/com_messages/config.xml
@@ -13,6 +13,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_messages"
-			section="component" />
+			section="component" 
+		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_messages/models/forms/config.xml b/administrator/components/com_messages/models/forms/config.xml
index b2fd4a741c337..a890efa2894a0 100644
--- a/administrator/components/com_messages/models/forms/config.xml
+++ b/administrator/components/com_messages/models/forms/config.xml
@@ -4,35 +4,34 @@
 		<field
 			name="lock"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="COM_MESSAGES_FIELD_LOCK_LABEL"
 			description="COM_MESSAGES_FIELD_LOCK_DESC"
-			default="0">
-			<option
-				value="1">JYES</option>
-			<option
-				value="0">JNO</option>
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
 		</field>
 
 		<field
 			name="mail_on_new"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="COM_MESSAGES_FIELD_MAIL_ON_NEW_LABEL"
 			description="COM_MESSAGES_FIELD_MAIL_ON_NEW_DESC"
-			default="1">
-			<option
-				value="1">JYES</option>
-			<option
-				value="0">JNO</option>
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
 		</field>
 
 		<field
 			name="auto_purge"
 			type="text"
+			label="COM_MESSAGES_FIELD_AUTO_PURGE_LABEL"
+			description="COM_MESSAGES_FIELD_AUTO_PURGE_DESC" 
 			size="6"
 			default="7"
-			label="COM_MESSAGES_FIELD_AUTO_PURGE_LABEL"
-			description="COM_MESSAGES_FIELD_AUTO_PURGE_DESC" />
+		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_messages/models/forms/message.xml b/administrator/components/com_messages/models/forms/message.xml
index 3188575ca85ac..2d1054a7e66f9 100644
--- a/administrator/components/com_messages/models/forms/message.xml
+++ b/administrator/components/com_messages/models/forms/message.xml
@@ -7,14 +7,16 @@
 			label="COM_MESSAGES_FIELD_USER_ID_TO_LABEL"
 			description="COM_MESSAGES_FIELD_USER_ID_TO_DESC"
 			default="0"
-			required="true" />
+			required="true" 
+		/>
 
 		<field
 			name="subject"
 			type="text"
 			label="COM_MESSAGES_FIELD_SUBJECT_LABEL"
 			description="COM_MESSAGES_FIELD_SUBJECT_DESC"
-			required="true" />
+			required="true" 
+		/>
 
 		<field
 			name="message"
@@ -23,6 +25,7 @@
 			description="COM_MESSAGES_FIELD_MESSAGE_DESC"
 			required="true"
 			filter="JComponentHelper::filterText"
-			buttons="false" />
+			buttons="false" 
+		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_modules/models/forms/advanced.xml b/administrator/components/com_modules/models/forms/advanced.xml
index 67cac97d2226b..3914d5657a83e 100644
--- a/administrator/components/com_modules/models/forms/advanced.xml
+++ b/administrator/components/com_modules/models/forms/advanced.xml
@@ -15,19 +15,19 @@
 			<field
 				name="bootstrap_size"
 				type="integer"
+				label="COM_MODULES_FIELD_BOOTSTRAP_SIZE_LABEL"
+				description="COM_MODULES_FIELD_BOOTSTRAP_SIZE_DESC"
 				first="0"
 				last="12"
 				step="1"
-				label="COM_MODULES_FIELD_BOOTSTRAP_SIZE_LABEL"
-				description="COM_MODULES_FIELD_BOOTSTRAP_SIZE_DESC"
 			/>
 
 			<field
 				name="header_tag"
 				type="headertag"
-				default="h3"
 				label="COM_MODULES_FIELD_HEADER_TAG_LABEL"
 				description="COM_MODULES_FIELD_HEADER_TAG_DESC"
+				default="h3"
 			/>
 
 			<field
diff --git a/administrator/components/com_modules/models/forms/module.xml b/administrator/components/com_modules/models/forms/module.xml
index f7f2effd60f01..d138f0f676ad0 100644
--- a/administrator/components/com_modules/models/forms/module.xml
+++ b/administrator/components/com_modules/models/forms/module.xml
@@ -1,55 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset>
-		<field name="id" type="text"
+		<field 
+			name="id" 
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			description="JGLOBAL_FIELD_ID_DESC"
 			default="0"
 			readonly="true"
 		/>
 
-		<field name="title" type="text"
-			description="COM_MODULES_FIELD_TITLE_DESC"
+		<field 
+			name="title" 
+			type="text"
 			label="JGLOBAL_TITLE"
+			description="COM_MODULES_FIELD_TITLE_DESC"
 			class="input-xxlarge input-large-text"
 			size="40"
 			maxlength="100"
 			required="true"
 		/>
 
-		<field name="note" type="text"
-			description="COM_MODULES_FIELD_NOTE_DESC"
+		<field 
+			name="note" 
+			type="text"
 			label="COM_MODULES_FIELD_NOTE_LABEL"
+			description="COM_MODULES_FIELD_NOTE_DESC"
 			maxlength="255"
 			size="40"
 			class="span12"
 		/>
 
-		<field name="module" type="hidden"
-			description="COM_MODULES_FIELD_MODULE_DESC"
+		<field 
+			name="module" 
+			type="hidden"
 			label="COM_MODULES_FIELD_MODULE_LABEL"
+			description="COM_MODULES_FIELD_MODULE_DESC"
 			readonly="readonly"
 			size="20"
 		/>
 
-		<field name="showtitle" type="radio"
+		<field 
+			name="showtitle" 
+			type="radio"
+			label="COM_MODULES_FIELD_SHOWTITLE_LABEL"
+			description="COM_MODULES_FIELD_SHOWTITLE_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			description="COM_MODULES_FIELD_SHOWTITLE_DESC"
-			label="COM_MODULES_FIELD_SHOWTITLE_LABEL"
 			size="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="published" type="list"
+		<field 
+			name="published" 
+			type="list"
+			label="JSTATUS"
+			description="COM_MODULES_FIELD_PUBLISHED_DESC"
 			class="chzn-color-state"
 			default="1"
-			description="COM_MODULES_FIELD_PUBLISHED_DESC"
-			label="JSTATUS"
 			size="1"
-		>
+			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 			<option value="-2">JTRASHED</option>
@@ -77,56 +89,78 @@
 			size="22"
 		/>
 
-		<field name="client_id" type="hidden"
-			description="COM_MODULES_FIELD_CLIENT_ID_DESC"
+		<field 
+			name="client_id" 
+			type="hidden"
 			label="COM_MODULES_FIELD_CLIENT_ID_LABEL"
+			description="COM_MODULES_FIELD_CLIENT_ID_DESC"
 			readonly="true"
 			size="1"
 		/>
 
-		<field name="position" type="moduleposition"
-			default=""
-			description="COM_MODULES_FIELD_POSITION_DESC"
+		<field 
+			name="position" 
+			type="moduleposition"
 			label="COM_MODULES_FIELD_POSITION_LABEL"
+			description="COM_MODULES_FIELD_POSITION_DESC"
+			default=""
 			maxlength="50"
 		/>
 
-		<field name="access" type="accesslevel"
-			description="JFIELD_ACCESS_DESC"
+		<field 
+			name="access" 
+			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
 			size="1"
 		/>
 
-		<field name="ordering" type="moduleorder"
-			linked="position"
-			description="JFIELD_ORDERING_DESC"
+		<field 
+			name="ordering" 
+			type="moduleorder"
 			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			linked="position"
 		/>
 
-		<field name="content" type="editor"
-			buttons="true"
+		<field 
+			name="content" 
+			type="editor"
+			label="COM_MODULES_FIELD_CONTENT_LABEL"
 			description="COM_MODULES_FIELD_CONTENT_DESC"
+			buttons="true"
 			filter="JComponentHelper::filterText"
-			label="COM_MODULES_FIELD_CONTENT_LABEL"
 			hide="readmore,pagebreak,module"
 		/>
 
-		<field name="language" type="contentlanguage"
-			description="JFIELD_MODULE_LANGUAGE_DESC"
+		<field 
+			name="language" 
+			type="contentlanguage"
 			label="JFIELD_LANGUAGE_LABEL"
-		>
+			description="JFIELD_MODULE_LANGUAGE_DESC"
+			>
 			<option value="*">JALL</option>
 		</field>
 
-		<field name="assignment" type="hidden" />
+		<field 
+			name="assignment" 
+			type="hidden"
+		/>
 
-		<field name="assigned" type="hidden" />
+		<field 
+			name="assigned" 
+			type="hidden"
+		/>
 
-		<field name="asset_id" type="hidden"
+		<field 
+			name="asset_id" 
+			type="hidden"
 			filter="unset"
 		/>
 
-		<field name="rules" type="rules"
+		<field 
+			name="rules" 
+			type="rules"
 			label="JFIELD_RULES_LABEL"
 			translate_label="false"
 			filter="rules"
diff --git a/administrator/components/com_plugins/models/forms/plugin.xml b/administrator/components/com_plugins/models/forms/plugin.xml
index e6c1ba35c5952..41a034319eb32 100644
--- a/administrator/components/com_plugins/models/forms/plugin.xml
+++ b/administrator/components/com_plugins/models/forms/plugin.xml
@@ -5,61 +5,67 @@
 	>
 		<field
 			name="extension_id"
-			label="JGLOBAL_FIELD_ID_LABEL"
-			description ="JGLOBAL_FIELD_ID_DESC"
 			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
 			default="0"
 			readonly="true"
-			class="readonly" />
+			class="readonly" 
+		/>
 
 		<field
 			name="name"
 			type="hidden"
 			label="COM_PLUGINS_FIELD_NAME_LABEL"
-			description="COM_PLUGINS_FIELD_NAME_DESC" />
+			description="COM_PLUGINS_FIELD_NAME_DESC" 
+		/>
 
 		<field
 			name="enabled"
 			type="list"
-			class="chzn-color-state"
 			label="JSTATUS"
 			description="COM_PLUGINS_FIELD_ENABLED_DESC"
+			class="chzn-color-state"
 			size="1"
-			default="1">
-				<option value="1">JENABLED</option>
-				<option value="0">JDISABLED</option>
+			default="1"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
 		</field>
 
-        <field
+		<field
 			name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
-			size="1" />
+			size="1" 
+		/>
 
 		<field
 			name="ordering"
 			type="Pluginordering"
 			label="JFIELD_ORDERING_LABEL"
-			description="JFIELD_ORDERING_DESC" />
+			description="JFIELD_ORDERING_DESC" 
+		/>
 
 		<field
 			name="folder"
 			type="text"
-			class="readonly"
-			size="20"
 			label="COM_PLUGINS_FIELD_FOLDER_LABEL"
 			description="COM_PLUGINS_FIELD_FOLDER_DESC"
-			readonly="true" />
+			class="readonly"
+			size="20"
+			readonly="true" 
+		/>
 
 		<field
 			name="element"
 			type="text"
-			class="readonly"
-			size="20"
 			label="COM_PLUGINS_FIELD_ELEMENT_LABEL"
 			description="COM_PLUGINS_FIELD_ELEMENT_DESC"
-			readonly="true" />
-
+			class="readonly"
+			size="20"
+			readonly="true" 
+		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_postinstall/config.xml b/administrator/components/com_postinstall/config.xml
index a9136d159a164..620bddaaeed15 100644
--- a/administrator/components/com_postinstall/config.xml
+++ b/administrator/components/com_postinstall/config.xml
@@ -12,6 +12,7 @@
 			label="JCONFIG_PERMISSIONS_LABEL"
 			filter="rules"
 			component="com_postinstall"
-			section="component" />
+			section="component" 
+		/>
 	</fieldset>	
 </config>
\ No newline at end of file
diff --git a/administrator/components/com_redirect/config.xml b/administrator/components/com_redirect/config.xml
index 0ff04c8f1a733..c2a41bd41e17b 100644
--- a/administrator/components/com_redirect/config.xml
+++ b/administrator/components/com_redirect/config.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-	<fieldset name="redirect"
+	<fieldset 
+		name="redirect"
 		label="COM_REDIRECT_ADVANCED_OPTIONS"
 	>
 		<field
 			name="mode"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_REDIRECT_MODE_LABEL"
 			description="COM_REDIRECT_MODE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 	</fieldset>
+
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC">
-
+		description="JCONFIG_PERMISSIONS_DESC"
+	>
 		<field
 			name="rules"
 			type="rules"
@@ -27,6 +29,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_redirect"
-			section="component" />
+			section="component" 
+		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_redirect/models/forms/link.xml b/administrator/components/com_redirect/models/forms/link.xml
index a00d64c9c40f9..c7fd6b46a5585 100644
--- a/administrator/components/com_redirect/models/forms/link.xml
+++ b/administrator/components/com_redirect/models/forms/link.xml
@@ -2,14 +2,15 @@
 <form>
 	<fieldset>
 		<field
-			id="id"
 			name="id"
 			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			id="id"
 			default="0"
 			readonly="true"
 			class="readonly"
-			label="JGLOBAL_FIELD_ID_LABEL"
-			description ="JGLOBAL_FIELD_ID_DESC" />
+		 />
 
 		<field
 			name="old_url"
@@ -18,7 +19,8 @@
 			description="COM_REDIRECT_FIELD_OLD_URL_DESC"
 			class="input-xxlarge"
 			size="50"
-			required="true" />
+			required="true" 
+		/>
 
 		<field
 			name="new_url"
@@ -27,14 +29,16 @@
 			description="COM_REDIRECT_FIELD_NEW_URL_DESC"
 			class="input-xxlarge"
 			size="50"
-			required="true" />
+			required="true" 
+		/>
 
 		<field
 			name="comment"
 			type="text"
 			label="COM_REDIRECT_FIELD_COMMENT_LABEL"
 			description="COM_REDIRECT_FIELD_COMMENT_DESC"
-			size="40" />
+			size="40" 
+		/>
 
 		<field
 			name="published"
@@ -44,65 +48,62 @@
 			class="chzn-color-state"
 			size="1"
 			required="true"
-			default="1">
-			<option
-				value="1">
-				JENABLED</option>
-			<option
-				value="0">
-				JDISABLED</option>
-			<option
-				value="2">
-				JARCHIVED</option>
-			<option
-				value="-2">
-				JTRASHED</option>
+			default="1"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
 		</field>
 
 		<field
 			name="referer"
 			type="text"
-			id="referer"
 			label="COM_REDIRECT_FIELD_REFERRER_LABEL"
+			id="referer"
 			size="50"
-			readonly="true" />
+			readonly="true" 
+		/>
 
 		<field
 			name="created_date"
 			type="text"
+			label="COM_REDIRECT_FIELD_CREATED_DATE_LABEL"
 			id="created_date"
 			class="readonly"
-			label="COM_REDIRECT_FIELD_CREATED_DATE_LABEL"
 			size="20"
-			readonly="true" />
+			readonly="true" 
+		/>
 
 		<field
 			name="modified_date"
 			type="text"
+			label="COM_REDIRECT_FIELD_UPDATED_DATE_LABEL"
 			id="modified_date"
 			class="readonly"
-			label="COM_REDIRECT_FIELD_UPDATED_DATE_LABEL"
 			size="20"
-			readonly="true" />
+			readonly="true" 
+		/>
 
 		<field
 			name="hits"
 			type="text"
+			label="JGLOBAL_HITS"
 			id="hits"
 			class="readonly"
-			label="JGLOBAL_HITS"
 			size="20"
 			readonly="true"
-			filter="unset" />
+			filter="unset" 
+		/>
 	</fieldset>
 	<fieldset name="advanced">
 		<field
 			name="header"
 			type="redirect"
-			default="301"
-			class="input-xlarge"
 			label="COM_REDIRECT_FIELD_REDIRECT_STATUS_CODE_LABEL"
 			description="COM_REDIRECT_FIELD_REDIRECT_STATUS_CODE_DESC"
+			default="301"
+			class="input-xlarge"
 		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml
index 7fbd9151083f9..3c846ae774c6e 100644
--- a/administrator/components/com_tags/config.xml
+++ b/administrator/components/com_tags/config.xml
@@ -18,10 +18,10 @@
 		<field
 			name="save_history"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
 			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -30,9 +30,9 @@
 		<field
 			name="history_limit"
 			type="text"
-			filter="integer"
 			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
 			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			filter="integer"
 			default="5"
 			showon="save_history:1"
 		/>
@@ -40,11 +40,11 @@
 		<field 
 			name="show_tag_title" 
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
 			description="COM_TAGS_SHOW_TAG_TITLE_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -52,11 +52,11 @@
 		<field 
 			name="tag_list_show_tag_image" 
 			type="radio"
-			class="btn-group btn-group-yesno"
-			description="COM_TAGS_SHOW_TAG_IMAGE_DESC"
 			label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
+			description="COM_TAGS_SHOW_TAG_IMAGE_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -64,11 +64,11 @@
 		<field 
 			name="tag_list_show_tag_description" 
 			type="radio" 
-			class="btn-group btn-group-yesno"
-			description="COM_TAGS_SHOW_TAG_DESCRIPTION_DESC"
 			label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
+			description="COM_TAGS_SHOW_TAG_DESCRIPTION_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -76,30 +76,32 @@
 		<field 
 			name="tag_list_image" 
 			type="media"
-			description="COM_TAGS_TAG_LIST_MEDIA_DESC"
 			label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
+			description="COM_TAGS_TAG_LIST_MEDIA_DESC"
 		/>
 	
-		<field name="tag_list_orderby"
+		<field 
+			name="tag_list_orderby"
 			type="list"
-			default="title"
 			label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
-			description="JGLOBAL_FIELD_FIELD_ORDERING_DESC">
-				<option value="c.core_title">JGLOBAL_TITLE</option>
-				<option value="match_count">COM_TAGS_MATCH_COUNT</option>
-				<option value="c.core_created_time">JGLOBAL_CREATED_DATE</option>
-				<option value="c.core_modified_time">JGLOBAL_MODIFIED_DATE</option>
-				<option value="c.core_publish_up">JGLOBAL_PUBLISHED_DATE</option>
+			description="JGLOBAL_FIELD_FIELD_ORDERING_DESC"
+			default="title"
+			>
+			<option value="c.core_title">JGLOBAL_TITLE</option>
+			<option value="match_count">COM_TAGS_MATCH_COUNT</option>
+			<option value="c.core_created_time">JGLOBAL_CREATED_DATE</option>
+			<option value="c.core_modified_time">JGLOBAL_MODIFIED_DATE</option>
+			<option value="c.core_publish_up">JGLOBAL_PUBLISHED_DATE</option>
 		</field>
 
 		<field 
 			name="tag_list_orderby_direction" 
 			type="radio" 
-			class="btn-group btn-group-yesno"
-			description="JGLOBAL_ORDER_DIRECTION_DESC"
 			label="JGLOBAL_ORDER_DIRECTION_LABEL"
+			description="JGLOBAL_ORDER_DIRECTION_DESC"
+			class="btn-group btn-group-yesno"
 			default="ASC"
-		>
+			>
 			<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
 			<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
 		</field>
@@ -107,11 +109,11 @@
 		<field 
 			name="show_headings" 
 			type="radio"
+			label="COM_TAGS_TAG_LIST_SHOW_HEADINGS_LABEL"
+			description="COM_TAGS_TAG_LIST_SHOW_HEADINGS_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"			
-			description="COM_TAGS_TAG_LIST_SHOW_HEADINGS_DESC"
-			label="COM_TAGS_TAG_LIST_SHOW_HEADINGS_LABEL"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -119,24 +121,24 @@
 		<field 
 			name="tag_list_show_date"
 			type="list"
-			default="0"
-			description="COM_TAGS_TAG_LIST_SHOW_DATE_LABEL"
 			label="COM_TAGS_TAG_LIST_SHOW_DATE_DESC"
-		>
-				<option value="0">JHIDE</option>
-				<option value="created">JGLOBAL_CREATED</option>
-				<option value="modified">JGLOBAL_MODIFIED</option>
-				<option value="published">JPUBLISHED</option>
+			description="COM_TAGS_TAG_LIST_SHOW_DATE_LABEL"
+			default="0"
+			>
+			<option value="0">JHIDE</option>
+			<option value="created">JGLOBAL_CREATED</option>
+			<option value="modified">JGLOBAL_MODIFIED</option>
+			<option value="published">JPUBLISHED</option>
 		</field>
 
 		<field 
 			name="tag_list_show_item_image" 
 			type="radio" 
-			class="btn-group btn-group-yesno"
-			description="COM_TAGS_SHOW_ITEM_IMAGE_DESC"
 			label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
+			description="COM_TAGS_SHOW_ITEM_IMAGE_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -144,10 +146,10 @@
 		<field 
 			name="tag_list_show_item_description" 
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
 			description="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -155,12 +157,11 @@
 		<field
 			name="tag_list_item_maximum_characters"
 			type="text"
-			filter="integer"
 			label="COM_TAGS_LIST_MAX_CHARACTERS_LABEL"
 			description="COM_TAGS_LIST_MAX_CHARACTERS_DESC"
+			filter="integer"
 			showon="tag_list_show_item_description:1"
-		>
-		</field>
+		/>
 
 	</fieldset>
 	
@@ -172,22 +173,22 @@
 		<field
 			name="min_term_length"
 			type="integer"
+			label="COM_TAGS_CONFIG_TAG_MIN_LENGTH_LABEL"
+			description="COM_TAGS_CONFIG_TAG_MIN_LENGTH_DESC"
 			first="1"
 			last="3"
 			step="1"
 			default="3"
-			label="COM_TAGS_CONFIG_TAG_MIN_LENGTH_LABEL"
-			description="COM_TAGS_CONFIG_TAG_MIN_LENGTH_DESC"
 		/>
 
 		<field 
 			name="return_any_or_all" 
 			type="radio" 
-			class="btn-group btn-group-yesno"
 			label="COM_TAGS_SEARCH_TYPE_LABEL"
 			description="COM_TAGS_SEARCH_TYPE_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">COM_TAGS_ANY</option>
 			<option value="0">COM_TAGS_ALL</option>
 		</field>
@@ -195,11 +196,11 @@
 		<field 
 			name="include_children" 
 			type="radio" 
-			class="btn-group btn-group-yesno"
-			description="COM_TAGS_INCLUDE_CHILDREN_DESC"
 			label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
+			description="COM_TAGS_INCLUDE_CHILDREN_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
-		>
+			>
 			<option value="1">COM_TAGS_INCLUDE</option>
 			<option value="0">COM_TAGS_EXCLUDE</option>
 		</field>
@@ -207,22 +208,22 @@
 		<field
 			name="maximum"
 			type="text"
+			label="COM_TAGS_LIST_MAX_LABEL"
+			description="COM_TAGS_LIST_MAX_DESC"
 			default="200"
 			filter="integer"
-			label="COM_TAGS_LIST_MAX_LABEL"
-			description="COM_TAGS_LIST_MAX_DESC">
-		</field>
+		/>
 		
 		<field 
 			name="tag_list_language_filter"
 			type="contentlanguage"
-			default="all"
 			label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
-			description="COM_TAGS_FIELD_LANGUAGE_FILTER_DESC">
-				<option value="all">JALL</option>
-				<option value="current_language">JCURRENT</option>
+			description="COM_TAGS_FIELD_LANGUAGE_FILTER_DESC"
+			default="all"
+			>
+			<option value="all">JALL</option>
+			<option value="current_language">JCURRENT</option>
 		</field>
-
 		
 	</fieldset>	
 
@@ -244,25 +245,25 @@
 		<field 
 			name="all_tags_orderby"
 			type="list"
-			default="title"
 			label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
 			description="JGLOBAL_FIELD_FIELD_ORDERING_DESC"
-		>
-				<option value="title">JGLOBAL_TITLE</option>
-				<option value="hits">JGLOBAL_HITS</option>
-				<option value="created_time">JGLOBAL_CREATED_DATE</option>
-				<option value="modified_time">JGLOBAL_MODIFIED_DATE</option>
-				<option value="publish_up">JGLOBAL_PUBLISHED_DATE</option>
+			default="title"
+			>
+			<option value="title">JGLOBAL_TITLE</option>
+			<option value="hits">JGLOBAL_HITS</option>
+			<option value="created_time">JGLOBAL_CREATED_DATE</option>
+			<option value="modified_time">JGLOBAL_MODIFIED_DATE</option>
+			<option value="publish_up">JGLOBAL_PUBLISHED_DATE</option>
 		</field>
 
 		<field 
 			name="all_tags_orderby_direction" 
-			type="radio" 
-			class="btn-group btn-group-yesno"
-			description="JGLOBAL_ORDER_DIRECTION_DESC"
+			type="radio"
 			label="JGLOBAL_ORDER_DIRECTION_LABEL"
+			description="JGLOBAL_ORDER_DIRECTION_DESC"
+			class="btn-group btn-group-yesno"
 			default="ASC"
-		>
+			>
 			<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
 			<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
 		</field>
@@ -270,11 +271,11 @@
 		<field 
 			name="all_tags_show_tag_image" 
 			type="radio" 
-			class="btn-group btn-group-yesno"
-			description="COM_TAGS_SHOW_ITEM_IMAGE_DESC"
 			label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
+			description="COM_TAGS_SHOW_ITEM_IMAGE_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -282,11 +283,11 @@
 		<field 
 			name="all_tags_show_tag_descripion" 
 			type="radio" 
-			class="btn-group btn-group-yesno"
-			description="COM_TAGS_SHOW_ITEM_DESCRIPTION_DESC"
 			label="COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL"
+			description="COM_TAGS_SHOW_ITEM_DESCRIPTION_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -294,26 +295,27 @@
 		<field
 			name="all_tags_tag_maximum_characters"
 			type="text"
-			filter="integer"
 			label="COM_TAGS_LIST_MAX_CHARACTERS_LABEL"
 			description="COM_TAGS_LIST_MAX_CHARACTERS_DESC"
+			filter="integer"
 			showon="all_tags_show_tag_descripion:1"
 		/>
 		
 		<field 
 			name="all_tags_show_tag_hits" 
 			type="radio" 
-			class="btn-group btn-group-yesno"
-			description="COM_TAGS_FIELD_CONFIG_HITS_DESC"
 			label="JGLOBAL_HITS"
+			description="COM_TAGS_FIELD_CONFIG_HITS_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
 	</fieldset>
-		<fieldset
+
+	<fieldset
 		name="shared"
 		label="COM_TAGS_CONFIG_SHARED_SETTINGS_LABEL"
 		description="COM_TAGS_CONFIG_SHARED_SETTINGS_DESC">
@@ -321,23 +323,23 @@
 		<field
 			name="filter_field"
 			type="radio"
+			label="JGLOBAL_FILTER_FIELD_LABEL"
+			description="JGLOBAL_FILTER_FIELD_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			description="JGLOBAL_FILTER_FIELD_DESC"
-			label="JGLOBAL_FILTER_FIELD_LABEL"
 			>
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field 
 			name="show_pagination_limit" 
 			type="radio"
+			label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			description="JGLOBAL_DISPLAY_SELECT_DESC"
 			default="1"
 			class="btn-group btn-group-yesno"
-			description="JGLOBAL_DISPLAY_SELECT_DESC"
-			label="JGLOBAL_DISPLAY_SELECT_LABEL"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -345,10 +347,10 @@
 		<field 
 			name="show_pagination" 
 			type="list"
-			default="2"
-			description="JGLOBAL_PAGINATION_DESC"
 			label="JGLOBAL_PAGINATION_LABEL"
-		>
+			description="JGLOBAL_PAGINATION_DESC"
+			default="2"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 			<option value="2">JGLOBAL_AUTO</option>
@@ -357,12 +359,12 @@
 		<field
 			name="show_pagination_results"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
 			showon="show_pagination:1,2"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -377,17 +379,15 @@
 		<field 
 			name="tag_field_ajax_mode" 
 			type="radio" 
-			class="btn-group btn-group-yesno"
-			description="COM_TAGS_TAG_FIELD_MODE_DESC"
 			label="COM_TAGS_TAG_FIELD_MODE_LABEL"
+			description="COM_TAGS_TAG_FIELD_MODE_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">COM_TAGS_TAG_FIELD_MODE_AJAX</option>
 			<option value="0">COM_TAGS_TAG_FIELD_MODE_NESTED</option>
 		</field>
-		
-	
-		
+
 	</fieldset>
 	
 	<fieldset 
@@ -399,12 +399,13 @@
 		<field
 			name="show_feed_link"
 			type="radio"
+			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			description="JGLOBAL_SHOW_FEED_LINK_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
-			description="JGLOBAL_SHOW_FEED_LINK_DESC">
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 	</fieldset>
@@ -422,6 +423,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_tags"
-			section="component" />
+			section="component"
+		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_tags/models/forms/tag.xml b/administrator/components/com_tags/models/forms/tag.xml
index e49d91bd36037..da0baab5703ab 100644
--- a/administrator/components/com_tags/models/forms/tag.xml
+++ b/administrator/components/com_tags/models/forms/tag.xml
@@ -3,19 +3,19 @@
 	<field
 		name="id"
 		type="text"
-		class="readonly"
 		label="JGLOBAL_FIELD_ID_LABEL"
 		description="JGLOBAL_FIELD_ID_DESC"
 		default="0"
+		class="readonly"
 		readonly="true"
 	/>
 
 	<field
 		name="hits"
 		type="text"
-		class="readonly"
 		label="JGLOBAL_HITS"
 		description="COM_TAGS_FIELD_HITS_DESC"
+		class="readonly"
 		default="0"
 		readonly="true"
 	/>
@@ -29,7 +29,7 @@
 		validate="notequals"
 		field="id"
 		parent="parent"
-	>
+		>
 		<option value="1">JNONE</option>
 	</field>
 
@@ -54,9 +54,9 @@
 	<field
 		name="path"
 		type="text"
-		class="readonly"
 		label="CATEGORIES_PATH_LABEL"
 		description="CATEGORIES_PATH_DESC"
+		class="readonly"
 		size="40"
 		readonly="true"
 	/>
@@ -64,9 +64,9 @@
 	<field
 		name="title"
 		type="text"
-		class="input-xxlarge input-large-text"
 		label="JGLOBAL_TITLE"
 		description="JFIELD_TITLE_DESC"
+		class="input-xxlarge input-large-text"
 		size="40"
 		required="true"
 	/>
@@ -74,10 +74,10 @@
 	<field
 		name="note"
 		type="text"
-		maxlength="255"
-		class="span12"
 		label="COM_TAGS_FIELD_NOTE_LABEL"
 		description="COM_TAGS_FIELD_NOTE_DESC"
+		maxlength="255"
+		class="span12"
 		size="40"
 	/>
 
@@ -94,12 +94,12 @@
 	<field
 		name="published"
 		type="list"
-		class="chzn-color-state"
 		label="JSTATUS"
 		description="JFIELD_PUBLISHED_DESC"
+		class="chzn-color-state"
 		default="1"
 		size="1"
-	>
+		>
 		<option value="1">JPUBLISHED</option>
 		<option value="0">JUNPUBLISHED</option>
 		<option value="2">JARCHIVED</option>
@@ -162,18 +162,18 @@
 	<field
 		name="created_by_alias"
 		type="text"
-		labelclass="control-label"
 		label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
 		description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
+		labelclass="control-label"
 		size="20"
 	/>
 
 	<field
 		name="created_time"
 		type="calendar"
-		class="readonly"
 		label="JGLOBAL_CREATED_DATE"
 		description="COM_TAGS_FIELD_CREATED_DATE_DESC"
+		class="readonly"
 		translateformat="true"
 		showtime="true"
 		filter="user_utc"
@@ -183,8 +183,8 @@
 	<field
 		name="modified_user_id"
 		type="user"
-		class="readonly"
 		label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+		class="readonly"
 		readonly="true"
 		filter="unset"
 	/>
@@ -192,9 +192,9 @@
 	<field
 		name="modified_time"
 		type="calendar"
-		class="readonly"
 		label="JGLOBAL_FIELD_MODIFIED_LABEL"
 		description="COM_TAGS_FIELD_MODIFIED_DESC"
+		class="readonly"
 		translateformat="true"
 		showtime="true"
 		filter="user_utc"
@@ -206,11 +206,12 @@
 		type="contentlanguage"
 		label="JFIELD_LANGUAGE_LABEL"
 		description="COM_TAGS_FIELD_LANGUAGE_DESC"
-	>
+		>
 		<option value="*">JALL</option>
 	</field>
 
-	<field name="version_note"
+	<field 
+		name="version_note"
 		type="text"
 		label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
 		description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
@@ -228,9 +229,9 @@
 			<field
 				name="tag_layout"
 				type="componentlayout"
-				labelclass="control-label"
 				label="JFIELD_ALT_LAYOUT_LABEL"
 				description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
+				labelclass="control-label"
 				useglobal="true"
 				extension="com_tags"
 				view="tag"
@@ -239,9 +240,9 @@
 			<field
 				name="tag_link_class"
 				type="text"
-				labelclass="control-label"
 				label="COM_TAGS_FIELD_TAG_LINK_CLASS"
 				description="COM_TAGS_FIELD_TAG_LINK_CLASS_DESC"
+				labelclass="control-label"
 				size="20"
 				default="label label-info"
 			/>
@@ -255,17 +256,17 @@
 				name="image_intro"
 				type="media"
 				label="COM_TAGS_FIELD_INTRO_LABEL"
-				labelclass="control-label"
 				description="COM_TAGS_FIELD_INTRO_DESC"
+				labelclass="control-label"
 			/>
 
 			<field
 				name="float_intro"
 				type="list"
-				labelclass="control-label"
 				label="COM_TAGS_FLOAT_LABEL"
 				description="COM_TAGS_FLOAT_DESC"
-			>
+				labelclass="control-label"
+				>
 				<option value="">JGLOBAL_SELECT_AN_OPTION</option>
 				<option value="right">COM_TAGS_RIGHT</option>
 				<option value="left">COM_TAGS_LEFT</option>
@@ -275,19 +276,19 @@
 			<field
 				name="image_intro_alt"
 				type="text"
-				labelclass="control-label"
 				label="COM_TAGS_FIELD_IMAGE_ALT_LABEL"
 				description="COM_TAGS_FIELD_IMAGE_ALT_DESC"
+				labelclass="control-label"
 				size="20"
 			/>
 
 			<field
 				name="image_intro_caption"
 				type="text"
-				labelclass="control-label"
 				label="COM_TAGS_FIELD_IMAGE_CAPTION_LABEL"
 				description="COM_TAGS_FIELD_IMAGE_CAPTION_DESC"
 				size="20"
+				labelclass="control-label"
 			/>
 
 			<field
@@ -300,17 +301,17 @@
 				name="image_fulltext"
 				type="media"
 				label="COM_TAGS_FIELD_FULL_LABEL"
-				labelclass="control-label"
 				description="COM_TAGS_FIELD_FULL_DESC"
+				labelclass="control-label"
 			/>
 
 			<field
 				name="float_fulltext"
 				type="list"
-				labelclass="control-label"
 				label="COM_TAGS_FLOAT_LABEL"
 				description="COM_TAGS_FLOAT_DESC"
-			>
+				labelclass="control-label"
+				>
 				<option value="">JGLOBAL_SELECT_AN_OPTION</option>
 				<option value="right">COM_TAGS_RIGHT</option>
 				<option value="left">COM_TAGS_LEFT</option>
@@ -320,18 +321,18 @@
 			<field
 				name="image_fulltext_alt"
 				type="text"
-				labelclass="control-label"
 				label="COM_TAGS_FIELD_IMAGE_ALT_LABEL"
 				description="COM_TAGS_FIELD_IMAGE_ALT_DESC"
+				labelclass="control-label"
 				size="20"
 			/>
 
 			<field
 				name="image_fulltext_caption"
 				type="text"
-				labelclass="control-label"
 				label="COM_TAGS_FIELD_IMAGE_CAPTION_LABEL"
 				description="COM_TAGS_FIELD_IMAGE_CAPTION_DESC"
+				labelclass="control-label"
 				size="20"
 			/>
 		</fieldset>
@@ -353,7 +354,7 @@
 				type="list"
 				label="JFIELD_METADATA_ROBOTS_LABEL"
 				description="JFIELD_METADATA_ROBOTS_DESC"
-			>
+				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
 				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
diff --git a/administrator/components/com_templates/config.xml b/administrator/components/com_templates/config.xml
index c8da44ed46351..3b7c468b0830f 100644
--- a/administrator/components/com_templates/config.xml
+++ b/administrator/components/com_templates/config.xml
@@ -8,16 +8,18 @@
 		<field
 			name="template_positions_display"
 			type="radio"
+			label="COM_TEMPLATES_CONFIG_POSITIONS_LABEL"
+			description="COM_TEMPLATES_CONFIG_POSITIONS_DESC"
 			class="btn-group btn-group-yesno"
 			default="0"
-			label="COM_TEMPLATES_CONFIG_POSITIONS_LABEL"
-			description="COM_TEMPLATES_CONFIG_POSITIONS_DESC">
+			>
 			<option value="1">JENABLED</option>
 			<option value="0">JDISABLED</option>
 		</field>
 
 		<field
-			name="upload_limit" type="text"
+			name="upload_limit" 
+			type="text"
 			label="COM_TEMPLATES_CONFIG_UPLOAD_LABEL"
 			description="COM_TEMPLATES_CONFIG_UPLOAD_DESC"
 			default="10"
@@ -25,7 +27,8 @@
 		/>
 
 		<field
-			name="warning" type="note"
+			name="warning" 
+			type="note"
 			label="COM_TEMPLATES_CONFIG_SUPPORTED_LABEL"
 			description="COM_TEMPLATES_CONFIG_SUPPORTED_DESC"
 			default="zip"
@@ -33,7 +36,8 @@
 		/>
 
 		<field
-			name="image_formats" type="text"
+			name="image_formats" 
+			type="text"
 			label="COM_TEMPLATES_CONFIG_IMAGE_LABEL"
 			description="COM_TEMPLATES_CONFIG_IMAGE_DESC"
 			default="gif,bmp,jpg,jpeg"
@@ -41,7 +45,8 @@
 		/>
 
 		<field
-			name="source_formats" type="text"
+			name="source_formats" 
+			type="text"
 			label="COM_TEMPLATES_CONFIG_SOURCE_LABEL"
 			description="COM_TEMPLATES_CONFIG_SOURCE_DESC"
 			default="txt,less,ini,xml,js,php,css,sass,scss"
@@ -49,7 +54,8 @@
 		/>
 
 		<field
-			name="font_formats" type="text"
+			name="font_formats" 
+			type="text"
 			label="COM_TEMPLATES_CONFIG_FONT_LABEL"
 			description="COM_TEMPLATES_CONFIG_FONT_DESC"
 			default="woff,ttf,otf"
@@ -57,7 +63,8 @@
 		/>
 
 		<field
-			name="compressed_formats" type="hidden"
+			name="compressed_formats" 
+			type="hidden"
 			default="zip"
 			extension="com_templates"
 		/>
@@ -75,6 +82,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_templates"
-			section="component" />
+			section="component"
+		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_templates/models/forms/source.xml b/administrator/components/com_templates/models/forms/source.xml
index d7f987f44ad0d..5aadea8d7d2ef 100644
--- a/administrator/components/com_templates/models/forms/source.xml
+++ b/administrator/components/com_templates/models/forms/source.xml
@@ -3,23 +3,26 @@
 	<fieldset>
 		<field
 			name="extension_id"
-			type="hidden" />
+			type="hidden" 
+		/>
 
 		<field
 			name="filename"
-			type="hidden" />
+			type="hidden"
+		 />
 
 		<field
 			name="source"
 			type="editor"
-			editor="codemirror|none"
-			buttons="no"
 			label="COM_TEMPLATES_FIELD_SOURCE_LABEL"
 			description="COM_TEMPLATES_FIELD_SOURCE_DESC"
+			editor="codemirror|none"
+			buttons="no"
 			height="500px"
 			rows="20"
 			cols="80"
 			syntax="php"
-			filter="raw" />
+			filter="raw" 
+		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_templates/models/forms/style.xml b/administrator/components/com_templates/models/forms/style.xml
index 24891a6c90a60..90ed931d373f9 100644
--- a/administrator/components/com_templates/models/forms/style.xml
+++ b/administrator/components/com_templates/models/forms/style.xml
@@ -2,14 +2,15 @@
 <form>
 	<fieldset>
 		<field
-			id="id"
 			name="id"
 			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			id="id"
 			default="0"
 			readonly="true"
 			class="readonly"
-			label="JGLOBAL_FIELD_ID_LABEL"
-			description ="JGLOBAL_FIELD_ID_DESC" />
+		/>
 
 		<field
 			name="template"
@@ -18,7 +19,8 @@
 			description="COM_TEMPLATES_FIELD_TEMPLATE_DESC"
 			class="readonly"
 			size="30"
-			readonly="true" />
+			readonly="true" 
+		/>
 
 		<field
 			name="client_id"
@@ -27,18 +29,23 @@
 			description="COM_TEMPLATES_FIELD_CLIENT_DESC"
 			class="readonly"
 			default="0"
-			readonly="true" />
+			readonly="true" 
+		/>
 
 		<field
 			name="title"
 			type="text"
-			class="input-xxlarge input-large-text"
-			size="50"
 			label="COM_TEMPLATES_FIELD_TITLE_LABEL"
 			description="COM_TEMPLATES_FIELD_TITLE_DESC"
-			required="true" />
+			class="input-xxlarge input-large-text"
+			size="50"
+			required="true" 
+		/>
 
-		<field name="assigned" type="hidden" />
+		<field 
+			name="assigned" 
+			type="hidden" 
+		/>
 
 	</fieldset>
 </form>
diff --git a/administrator/components/com_templates/models/forms/style_administrator.xml b/administrator/components/com_templates/models/forms/style_administrator.xml
index 9412161cb5431..219d381b90673 100644
--- a/administrator/components/com_templates/models/forms/style_administrator.xml
+++ b/administrator/components/com_templates/models/forms/style_administrator.xml
@@ -7,7 +7,8 @@
 			label="COM_TEMPLATES_FIELD_HOME_LABEL"
 			description="COM_TEMPLATES_FIELD_HOME_ADMINISTRATOR_DESC"
 			class="btn-group btn-group-yesno"
-			default="0">
+			default="0"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
diff --git a/administrator/components/com_templates/models/forms/style_site.xml b/administrator/components/com_templates/models/forms/style_site.xml
index 078ed73c6d512..d30c7809e4224 100644
--- a/administrator/components/com_templates/models/forms/style_site.xml
+++ b/administrator/components/com_templates/models/forms/style_site.xml
@@ -6,7 +6,8 @@
 			type="contentlanguage"
 			label="COM_TEMPLATES_FIELD_HOME_LABEL"
 			description="COM_TEMPLATES_FIELD_HOME_SITE_DESC"
-			default="0">
+			default="0"
+			>
 			<option value="0">JNO</option>
 			<option value="1">JALL</option>
 		</field>
diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml
index 6dd615ba9b6c8..3a4c88a34c468 100644
--- a/administrator/components/com_users/config.xml
+++ b/administrator/components/com_users/config.xml
@@ -6,10 +6,11 @@
 		<field
 			name="allowUserRegistration"
 			type="radio"
+			label="COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL"
+			description="COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC"
 			class="btn-group btn-group-yesno"
 			default="0"
-			label="COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL"
-			description="COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -17,30 +18,29 @@
 		<field
 			name="new_usertype"
 			type="usergrouplist"
-			default="2"
 			label="COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_LABEL"
 			description="COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_DESC"
+			default="2"
 			checksuperusergroup="1"
-			>
-		</field>
+		/>
 
 		<field
 			name="guest_usergroup"
 			type="usergrouplist"
-			default="1"
 			label="COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_LABEL"
 			description="COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_DESC"
+			default="1"
 			checksuperusergroup="1"
-			>
-		</field>
+		/>
 
 		<field
 			name="sendpassword"
 			type="radio"
+			label="COM_USERS_CONFIG_FIELD_SENDPASSWORD_LABEL"
+			description="COM_USERS_CONFIG_FIELD_SENDPASSWORD_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_USERS_CONFIG_FIELD_SENDPASSWORD_LABEL"
-			description="COM_USERS_CONFIG_FIELD_SENDPASSWORD_DESC">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -48,24 +48,23 @@
 		<field
 			name="useractivation"
 			type="list"
-			default="2"
 			label="COM_USERS_CONFIG_FIELD_USERACTIVATION_LABEL"
-			description="COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC">
-			<option
-				value="0">JNONE</option>
-			<option
-				value="1">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION</option>
-			<option
-				value="2">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION</option>
+			description="COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC"
+			default="2"
+			>
+			<option value="0">JNONE</option>
+			<option value="1">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION</option>
+			<option value="2">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION</option>
 		</field>
 
 		<field
 			name="mail_to_admin"
 			type="radio"
+			label="COM_USERS_CONFIG_FIELD_MAILTOADMIN_LABEL"
+			description="COM_USERS_CONFIG_FIELD_MAILTOADMIN_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_USERS_CONFIG_FIELD_MAILTOADMIN_LABEL"
-			description="COM_USERS_CONFIG_FIELD_MAILTOADMIN_DESC">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -73,46 +72,49 @@
 		<field
 			name="captcha"
 			type="plugins"
-			folder="captcha"
-			default=""
 			label="COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL"
 			description="COM_USERS_CONFIG_FIELD_CAPTCHA_DESC"
-			filter="cmd" >
-			<option
-				value="">JOPTION_USE_DEFAULT</option>
-			<option
-				value="0">JOPTION_DO_NOT_USE</option>
+			folder="captcha"
+			default=""
+			filter="cmd" 
+			>
+			<option value="">JOPTION_USE_DEFAULT</option>
+			<option value="0">JOPTION_DO_NOT_USE</option>
 		</field>
 
 		<field
 			name="frontend_userparams"
 			type="radio"
+			label="COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_LABEL"
+			description="COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_LABEL"
-			description="COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="site_language"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_USERS_CONFIG_FIELD_FRONTEND_LANG_LABEL"
 			description="COM_USERS_CONFIG_FIELD_FRONTEND_LANG_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			showon="frontend_userparams:1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field
 			name="change_login_name"
 			type="radio"
+			label="COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL"
+			description="COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC"
 			class="btn-group btn-group-yesno"
 			default="0"
-			label="COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL"
-			description="COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -130,8 +132,8 @@
 			first="0"
 			last="20"
 			step="1"
-			default="10">
-			</field>
+			default="10"
+		/>
 
 		<field
 			name="reset_time"
@@ -141,8 +143,8 @@
 			first="1"
 			last="24"
 			step="1"
-			default="1">
-			</field>
+			default="1"
+		/>
 
 		<field
 			name="minimum_length"
@@ -152,8 +154,8 @@
 			first="4"
 			last="99"
 			step="1"
-			default="4">
-			</field>
+			default="4"
+		/>
 
 		<field
 			name="minimum_integers"
@@ -163,8 +165,8 @@
 			first="0"
 			last="98"
 			step="1"
-			default="0">
-			</field>
+			default="0"
+		/>
 
 		<field
 			name="minimum_symbols"
@@ -174,8 +176,8 @@
 			first="0"
 			last="98"
 			step="1"
-			default="0">
-			</field>
+			default="0"
+		/>
 
 		<field
 			name="minimum_uppercase"
@@ -185,21 +187,22 @@
 			first="0"
 			last="98"
 			step="1"
-			default="0">
-			</field>
+			default="0"
+		/>
+
 	</fieldset>
 
 	<fieldset
 		name="user_notes_history"
 		label="COM_USERS_CONFIG_FIELD_NOTES_HISTORY" >
 
-			<field
+		<field
 			name="save_history"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
 			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -208,12 +211,13 @@
 		<field
 			name="history_limit"
 			type="text"
-			filter="integer"
 			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
 			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			filter="integer"
 			default="5"
 			showon="save_history:1"
 		/>
+
 	</fieldset>
 
  	<fieldset
@@ -231,10 +235,10 @@
  		<field
  			name="mailBodySuffix"
 			type="textarea"
- 			rows="5"
- 			cols="30"
 			label="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_LABEL"
 			description="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_DESC"
+ 			rows="5"
+ 			cols="30"
 		/>
 
 	</fieldset>
@@ -247,11 +251,11 @@
 		<field
 			name="debugUsers"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_USERS_DEBUG_USERS_LABEL"
 			description="COM_USERS_DEBUG_USERS_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -259,11 +263,11 @@
 		<field
 			name="debugGroups"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_USERS_DEBUG_GROUPS_LABEL"
 			description="COM_USERS_DEBUG_GROUPS_DESC"
-		>
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -278,11 +282,11 @@
 		<field
 			name="custom_fields_enable"
 			type="radio"
-			class="btn-group btn-group-yesno"
 			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
 			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -302,6 +306,8 @@
 			filter="rules"
 			validate="rules"
 			component="com_users"
-			section="component" />
+			section="component"
+		/>
+
 	</fieldset>
 </config>
diff --git a/administrator/components/com_users/models/forms/filter_debuggroup.xml b/administrator/components/com_users/models/forms/filter_debuggroup.xml
index f09569a9e947f..72eb8deb0e034 100644
--- a/administrator/components/com_users/models/forms/filter_debuggroup.xml
+++ b/administrator/components/com_users/models/forms/filter_debuggroup.xml
@@ -8,6 +8,7 @@
 			description="COM_USERS_SEARCH_IN_ASSETS"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="component"
 			type="Components"
@@ -17,6 +18,7 @@
 			>
 			<option value="">COM_USERS_OPTION_SELECT_COMPONENT</option>
 		</field>
+
 		<field
 			name="level_start"
 			type="Levels"
@@ -26,6 +28,7 @@
 			>
 			<option value="">COM_USERS_OPTION_SELECT_LEVEL_START</option>
 		</field>
+
 		<field
 			name="level_end"
 			type="Levels"
@@ -36,6 +39,7 @@
 			<option value="">COM_USERS_OPTION_SELECT_LEVEL_END</option>
 		</field>
 	</fields>
+
 	<fields name="list">
 		<field
 			name="fullordering"
@@ -53,6 +57,7 @@
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
diff --git a/administrator/components/com_users/models/forms/filter_users.xml b/administrator/components/com_users/models/forms/filter_users.xml
index 991e94cfbf521..af0a88b65b691 100644
--- a/administrator/components/com_users/models/forms/filter_users.xml
+++ b/administrator/components/com_users/models/forms/filter_users.xml
@@ -36,12 +36,12 @@
 			<option value="">COM_USERS_FILTER_USERGROUP</option>
 		</field>
 		<field
-				name="lastvisitrange"
-				type="lastvisitdaterange"
-				label="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
-				description="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
-				onchange="this.form.submit();"
-		>
+			name="lastvisitrange"
+			type="lastvisitdaterange"
+			label="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
+			description="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
+			onchange="this.form.submit();"
+			>
 			<option value="">COM_USERS_OPTION_FILTER_LAST_VISIT_DATE</option>
 		</field>
 		<field
@@ -84,10 +84,10 @@
 		<field
 			name="limit"
 			type="limitbox"
-			class="input-mini"
-			default="25"
 			label="COM_CONTENT_LIST_LIMIT"
 			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
 			onchange="this.form.submit();"
 		/>
 	</fields>
diff --git a/administrator/components/com_users/models/forms/group.xml b/administrator/components/com_users/models/forms/group.xml
index 69281dc2532e4..b8cc7dba71b16 100644
--- a/administrator/components/com_users/models/forms/group.xml
+++ b/administrator/components/com_users/models/forms/group.xml
@@ -1,33 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset>
-		<field name="id" type="hidden"
+		<field 
+			name="id" 
+			type="hidden"
 			default="0"
 			required="true"
 			readonly="true"
 		/>
 
-		<field name="title" type="text"
-			required="true"
-			description="COM_USERS_GROUP_FIELD_TITLE_DESC"
+		<field 
+			name="title" 
+			type="text"
 			label="COM_USERS_GROUP_FIELD_TITLE_LABEL"
+			description="COM_USERS_GROUP_FIELD_TITLE_DESC"
+			required="true"
 			size="40"
 		/>
 
-		<field name="parent_id" type="groupparent"
-			description="COM_USERS_GROUP_FIELD_PARENT_DESC"
+		<field 
+			name="parent_id" 
+			type="groupparent"
 			label="COM_USERS_GROUP_FIELD_PARENT_LABEL"
+			description="COM_USERS_GROUP_FIELD_PARENT_DESC"
 			required="true"
 		/>
 
-		<field name="actions" type="hidden"
+		<field 
+			name="actions" 
+			type="hidden"
 			multiple="true"
 		/>
 
-		<field name="lft" type="hidden"
+		<field 
+			name="lft" 
+			type="hidden"
 			filter="unset"
 		/>
-		<field name="rgt" type="hidden"
+
+		<field 
+			name="rgt" 
+			type="hidden"
 			filter="unset"
 		/>
 	</fieldset>
diff --git a/administrator/components/com_users/models/forms/level.xml b/administrator/components/com_users/models/forms/level.xml
index 7c70d542fc925..0651cacbcccea 100644
--- a/administrator/components/com_users/models/forms/level.xml
+++ b/administrator/components/com_users/models/forms/level.xml
@@ -1,26 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset>
-		<field name="id" type="hidden"
+		<field 
+			name="id" 
+			type="hidden"
 			default="0"
 			readonly="true"
 			required="true"
 		/>
 
-		<field name="title" type="text"
-			required="true"
-			description="COM_USERS_LEVEL_FIELD_TITLE_DESC"
+		<field 
+			name="title" 
+			type="text"
 			label="COM_USERS_LEVEL_FIELD_TITLE_LABEL"
+			description="COM_USERS_LEVEL_FIELD_TITLE_DESC"
+			required="true"
 			size="50"
 		/>
 
-		<field name="ordering" type="text"
-			default="0"
-			description="JFIELD_ORDERING_DESC"
+		<field 
+			name="ordering" 
+			type="text"
 			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			default="0"
 		/>
 
-		<field name="rules" type="hidden"
+		<field 
+			name="rules" 
+			type="hidden"
 			filter="int_array"
 		/>
 	</fieldset>
diff --git a/administrator/components/com_users/models/forms/mail.xml b/administrator/components/com_users/models/forms/mail.xml
index 78d00f81f16a5..7f336dc0e58e5 100644
--- a/administrator/components/com_users/models/forms/mail.xml
+++ b/administrator/components/com_users/models/forms/mail.xml
@@ -2,53 +2,67 @@
 <form>
 	<fieldset>
 
-		<field name="recurse" type="checkbox"
-			description="COM_USERS_MAIL_FIELD_RECURSE_DESC"
+		<field 
+			name="recurse" 
+			type="checkbox"
 			label="COM_USERS_MAIL_FIELD_RECURSE_LABEL"
+			description="COM_USERS_MAIL_FIELD_RECURSE_DESC"
 			value="1"
 		/>
 
-		<field name="mode" type="checkbox"
-			description="COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_DESC"
+		<field 
+			name="mode" 
+			type="checkbox"
 			label="COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_LABEL"
+			description="COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_DESC"
 			value="1"
 		/>
 
-		<field name="disabled" type="checkbox"
-			description="COM_USERS_MAIL_FIELD_EMAIL_DISABLED_USERS_DESC"
+		<field 
+			name="disabled" 
+			type="checkbox"
 			label="COM_USERS_MAIL_FIELD_EMAIL_DISABLED_USERS_LABEL"
+			description="COM_USERS_MAIL_FIELD_EMAIL_DISABLED_USERS_DESC"
 			value="1"
 		/>
 
-		<field name="group" type="usergrouplist"
-			default="0"
-			description="COM_USERS_MAIL_FIELD_GROUP_DESC"
+		<field 
+			name="group" 
+			type="usergrouplist"
 			label="COM_USERS_MAIL_FIELD_GROUP_LABEL"
+			description="COM_USERS_MAIL_FIELD_GROUP_DESC"
+			default="0"
 			size="10"
-		>
+			>
 			<option value="0">COM_USERS_MAIL_FIELD_VALUE_ALL_USERS_GROUPS</option>
 		</field>
 
-		<field name="bcc" type="checkbox"
-			default="1"
-			description="COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC"
+		<field 
+			name="bcc" 
+			type="checkbox"
 			label="COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_LABEL"
+			description="COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC"
+			default="1"
 			value="1"
 		/>
 
-		<field name="subject" type="text"
-			class="span8"
-			description="COM_USERS_MAIL_FIELD_SUBJECT_DESC"
+		<field 
+			name="subject" 
+			type="text"
 			label="COM_USERS_MAIL_FIELD_SUBJECT_LABEL"
+			description="COM_USERS_MAIL_FIELD_SUBJECT_DESC"
+			class="span8"
 			maxlength="150"
 			size="30"
 		/>
 
-		<field name="message" type="textarea"
+		<field 
+			name="message" 
+			type="textarea"
+			label="COM_USERS_MAIL_FIELD_MESSAGE_LABEL"
+			description="COM_USERS_MAIL_FIELD_MESSAGE_DESC"
 			class="span11 vert"
 			cols="70"
-			description="COM_USERS_MAIL_FIELD_MESSAGE_DESC"
-			label="COM_USERS_MAIL_FIELD_MESSAGE_LABEL"
 			rows="20"
 		/>
 	</fieldset>
diff --git a/administrator/components/com_users/models/forms/note.xml b/administrator/components/com_users/models/forms/note.xml
index 3fc8da2785ab4..13cd9379dea0c 100644
--- a/administrator/components/com_users/models/forms/note.xml
+++ b/administrator/components/com_users/models/forms/note.xml
@@ -6,22 +6,22 @@
 		<field
 			name="id"
 			type="hidden"
+			label="COM_USERS_FIELD_ID_LABEL"
 			class="readonly"
 			size="6"
 			default="0"
 			readonly="true"
-			label="COM_USERS_FIELD_ID_LABEL"
-			/>
+		/>
 
 		<field
 			name="user_id"
 			type="user"
+			label="COM_USERS_FIELD_USER_ID_LABEL"
+			description="JLIB_FORM_SELECT_USER"
 			size="50"
 			class="input-medium"
 			required="true"
-			label="COM_USERS_FIELD_USER_ID_LABEL"
-			description="JLIB_FORM_SELECT_USER"
-			/>
+		/>
 
 		<field
 			name="catid"
@@ -39,20 +39,20 @@
 		<field
 			name="subject"
 			type="text"
-			size="80"
 			label="COM_USERS_FIELD_SUBJECT_LABEL"
 			description="COM_USERS_FIELD_SUBJECT_DESC"
-			/>
+			size="80"
+		/>
 
 		<field
 			name="body"
 			type="editor"
+			label="COM_USERS_FIELD_NOTEBODY_LABEL"
+			description="COM_USERS_FIELD_NOTEBODY_DESC"
 			rows="10"
 			cols="80"
 			filter="safehtml"
-			label="COM_USERS_FIELD_NOTEBODY_LABEL"
-			description="COM_USERS_FIELD_NOTEBODY_DESC"
-			/>
+		/>
 
 		<field
 			name="state"
@@ -60,15 +60,12 @@
 			label="JSTATUS"
 			description="COM_USERS_FIELD_STATE_DESC"
 			size="1"
-			default="1">
-			<option
-				value="1">JPUBLISHED</option>
-			<option
-				value="0">JUNPUBLISHED</option>
-			<option
-				value="2">JARCHIVED</option>
-			<option
-				value="-2">JTRASHED</option>
+			default="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
 		</field>
 
 		<field
@@ -78,47 +75,47 @@
 			description="COM_USERS_FIELD_REVIEW_TIME_DESC"
 			default="NOW"
 			translateformat="true"
-			/>
+		/>
 
 		<field
 			name="checked_out"
 			type="hidden"
 			filter="unset"
-			/>
+		/>
 
 		<field
 			name="checked_out_time"
 			type="hidden"
 			filter="unset"
-			/>
+		/>
 
 		<field
 			name="created_user_id"
-			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
 			type="hidden"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
 			filter="unset"
-			/>
+		/>
 
 		<field
 			name="created_time"
-			label="JGLOBAL_FIELD_CREATED_LABEL"
 			type="hidden"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
 			filter="unset"
-			/>
+		/>
 
 		<field
 			name="modified_user_id"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			type="hidden"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			filter="unset"
-			/>
+		/>
 
 		<field
 			name="modified_time"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL"
 			type="hidden"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
 			filter="unset"
-			/>
+		/>
 
 		<field
 			name="publish_up"
@@ -150,6 +147,6 @@
 			maxlength="255"
 			size="45"
 			labelclass="control-label"
-			/>
+		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_users/models/forms/user.xml b/administrator/components/com_users/models/forms/user.xml
index bd0e1883215f8..9d6ae15126add 100644
--- a/administrator/components/com_users/models/forms/user.xml
+++ b/administrator/components/com_users/models/forms/user.xml
@@ -1,45 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset name="user_details">
-		<field name="name" type="text"
-			description="COM_USERS_USER_FIELD_NAME_DESC"
+		<field 
+			name="name" 
+			type="text"
 			label="COM_USERS_USER_FIELD_NAME_LABEL"
+			description="COM_USERS_USER_FIELD_NAME_DESC"
 			required="true"
 			size="30"
 		/>
 
-		<field name="username" type="text"
-			description="COM_USERS_USER_FIELD_USERNAME_DESC"
+		<field 
+			name="username"
+			type="text"
 			label="COM_USERS_USER_FIELD_USERNAME_LABEL"
+			description="COM_USERS_USER_FIELD_USERNAME_DESC"
 			required="true"
 			size="30"
 		/>
 
-		<field name="password" type="password"
+		<field 
+			name="password" 
+			type="password"
+			label="JGLOBAL_PASSWORD"
+			description="COM_USERS_USER_FIELD_PASSWORD_DESC"
 			autocomplete="off"
 			class="validate-password"
-			description="COM_USERS_USER_FIELD_PASSWORD_DESC"
 			filter="raw"
 			validate="password"
-			label="JGLOBAL_PASSWORD"
 			size="30"
 		/>
 
-		<field name="password2" type="password"
+		<field 
+			name="password2" 
+			type="password"
+			label="COM_USERS_USER_FIELD_PASSWORD2_LABEL"
+			description="COM_USERS_USER_FIELD_PASSWORD2_DESC"
 			autocomplete="off"
 			class="validate-password"
-			description="COM_USERS_USER_FIELD_PASSWORD2_DESC"
 			filter="raw"
-			label="COM_USERS_USER_FIELD_PASSWORD2_LABEL"
 			message="COM_USERS_USER_FIELD_PASSWORD1_MESSAGE"
 			size="30"
 			validate="equals"
 			field="password"
 		/>
 
-		<field name="email" type="email"
-			description="COM_USERS_USER_FIELD_EMAIL_DESC"
+		<field 
+			name="email" 
+			type="email"
 			label="JGLOBAL_EMAIL"
+			description="COM_USERS_USER_FIELD_EMAIL_DESC"
 			required="true"
 			size="30"
 			validate="email"
@@ -48,9 +58,9 @@
 		<field
 			name="registerDate"
 			type="calendar"
-			class="readonly"
 			label="COM_USERS_USER_FIELD_REGISTERDATE_LABEL"
 			description="COM_USERS_USER_FIELD_REGISTERDATE_DESC"
+			class="readonly"
 			readonly="true"
 			translateformat="true"
 			showtime="true"
@@ -61,9 +71,9 @@
 		<field
 			name="lastvisitDate"
 			type="calendar"
-			class="readonly"
 			label="COM_USERS_USER_FIELD_LASTVISIT_LABEL"
 			description="COM_USERS_USER_FIELD_LASTVISIT_DESC"
+			class="readonly"
 			readonly="true"
 			translateformat="true"
 			showtime="true"
@@ -74,9 +84,9 @@
 		<field
 			name="lastResetTime"
 			type="calendar"
-			class="readonly"
 			label="COM_USERS_USER_FIELD_LASTRESET_LABEL"
 			description="COM_USERS_USER_FIELD_LASTRESET_DESC"
+			class="readonly"
 			readonly="true"
 			translateformat="true"
 			showtime="true"
@@ -87,42 +97,45 @@
 		<field
 			name="resetCount"
 			type="text"
-			class="readonly"
 			label="COM_USERS_USER_FIELD_RESETCOUNT_LABEL"
-			description ="COM_USERS_USER_FIELD_RESETCOUNT_DESC"
+			description="COM_USERS_USER_FIELD_RESETCOUNT_DESC"
+			class="readonly"
 			default="0"
 			readonly="true"
-			/>
+		/>
 
 		<field
-				name="sendEmail"
-				type="radio"
-				default="0"
-				class="btn-group btn-group-yesno"
-				label="COM_USERS_USER_FIELD_SENDEMAIL_LABEL"
-				description="COM_USERS_USER_FIELD_SENDEMAIL_DESC">
-				<option value="1">JYES</option>
-				<option value="0">JNO</option>
+			name="sendEmail"
+			type="radio"
+			label="COM_USERS_USER_FIELD_SENDEMAIL_LABEL"
+			description="COM_USERS_USER_FIELD_SENDEMAIL_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
 		</field>
 
 		<field
-				name="block"
-				type="radio"
-				class="btn-group btn-group-yesno btn-group-reversed"
-				default="0"
-				label="COM_USERS_USER_FIELD_BLOCK_LABEL"
-				description="COM_USERS_USER_FIELD_BLOCK_DESC">
-				<option value="1">COM_USERS_USER_FIELD_BLOCK</option>
-				<option value="0">COM_USERS_USER_FIELD_ENABLE</option>
+			name="block"
+			type="radio"
+			label="COM_USERS_USER_FIELD_BLOCK_LABEL"
+			description="COM_USERS_USER_FIELD_BLOCK_DESC"
+			class="btn-group btn-group-yesno btn-group-reversed"
+			default="0"
+			>
+			<option value="1">COM_USERS_USER_FIELD_BLOCK</option>
+			<option value="0">COM_USERS_USER_FIELD_ENABLE</option>
 		</field>
 
 		<field
 			name="requireReset"
 			type="radio"
+			label="COM_USERS_USER_FIELD_REQUIRERESET_LABEL"
+			description="COM_USERS_USER_FIELD_REQUIRERESET_DESC"
 			default="0"
 			class="btn-group btn-group-yesno"
-			label="COM_USERS_USER_FIELD_REQUIRERESET_LABEL"
-			description="COM_USERS_USER_FIELD_REQUIRERESET_DESC">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -130,12 +143,12 @@
 		<field
 			name="id"
 			type="text"
-			class="readonly"
 			label="JGLOBAL_FIELD_ID_LABEL"
-			description ="JGLOBAL_FIELD_ID_DESC"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
 			default="0"
 			readonly="true"
-			/>
+		/>
 
 	</fieldset>
 	<field name="groups" type="hidden" />
@@ -146,48 +159,61 @@
 		<!--  Basic user account settings. -->
 		<fieldset name="settings" label="COM_USERS_SETTINGS_FIELDSET_LABEL">
 
-			<field name="admin_style" type="templatestyle"
-				client="administrator"
-				description="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_DESC"
+			<field 
+				name="admin_style" 
+				type="templatestyle"
 				label="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL"
-			>
+				description="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_DESC"
+				client="administrator"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="admin_language" type="language"
-				client="administrator"
-				description="COM_USERS_USER_FIELD_BACKEND_LANGUAGE_DESC"
+			<field 
+				name="admin_language" 
+				type="language"
 				label="COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL"
-			>
+				description="COM_USERS_USER_FIELD_BACKEND_LANGUAGE_DESC"
+				client="administrator"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="language" type="language"
-				client="site"
-				description="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+			<field 
+				name="language" 
+				type="language"
 				label="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
-			>
+				description="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+				client="site"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="editor" type="plugins" folder="editors"
-				description="COM_USERS_USER_FIELD_EDITOR_DESC"
+			<field 
+				name="editor" 
+				type="plugins" 
 				label="COM_USERS_USER_FIELD_EDITOR_LABEL"
-			>
+				description="COM_USERS_USER_FIELD_EDITOR_DESC"
+				folder="editors"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="helpsite" type="helpsite"
+			<field 
+				name="helpsite" 
+				type="helpsite"
 				label="COM_USERS_USER_FIELD_HELPSITE_LABEL"
 				description="COM_USERS_USER_FIELD_HELPSITE_DESC"
-			>
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="timezone" type="timezone"
+			<field 
+				name="timezone" 
+				type="timezone"
 				label="COM_USERS_USER_FIELD_TIMEZONE_LABEL"
 				description="COM_USERS_USER_FIELD_TIMEZONE_DESC"
-			>
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>