diff --git a/src/administrator/components/com_weblinks/config.xml b/src/administrator/components/com_weblinks/config.xml
index 786360c..3ac3597 100644
--- a/src/administrator/components/com_weblinks/config.xml
+++ b/src/administrator/components/com_weblinks/config.xml
@@ -20,9 +20,9 @@
 		<field
 			name="target"
 			type="list"
-			default="0"
-			description="COM_WEBLINKS_FIELD_TARGET_DESC"
 			label="COM_WEBLINKS_FIELD_TARGET_LABEL"
+			default="0"
+			validate="options"
 			>
 			<option value="0">JBROWSERTARGET_PARENT</option>
 			<option value="1">JBROWSERTARGET_NEW</option>
@@ -33,9 +33,9 @@
 		<field
 			name="save_history"
 			type="radio"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="0"
-			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
 			>
 			<option value="0">JNO</option>
 			<option value="1">JYES</option>
@@ -43,20 +43,19 @@
 
 		<field
 			name="history_limit"
-			type="text"
-			filter="integer"
+			type="number"
 			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
-			default="5"
+			filter="integer"
+			default="10"
 			showon="save_history:1"
 		/>
 
 		<field
 			name="count_clicks"
 			type="radio"
+			label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
-			description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC"
 			>
 			<option value="0">JNO</option>
 			<option value="1">JYES</option>
@@ -73,7 +72,6 @@
 			type="list"
 			default="1"
 			label="COM_WEBLINKS_FIELD_ICON_LABEL"
-			description="COM_WEBLINKS_FIELD_ICON_DESC"
 			filter="integer"
 			>
 			<option value="0">COM_WEBLINKS_FIELD_ICON_OPTION_TEXT</option>
@@ -98,7 +96,8 @@
 			name="float_first"
 			type="list"
 			label="COM_WEBLINKS_FLOAT_FIRST_LABEL"
-			description="COM_WEBLINKS_FLOAT_FIRST_DESC"
+			default="none"
+			validate="options"
 			>
 			<option value="right">COM_WEBLINKS_RIGHT</option>
 			<option value="left">COM_WEBLINKS_LEFT</option>
@@ -109,7 +108,8 @@
 			name="float_second"
 			type="list"
 			label="COM_WEBLINKS_FLOAT_SECOND_LABEL"
-			description="COM_WEBLINKS_FLOAT_SECOND_DESC"
+			default="none"
+			validate="options"
 			>
 			<option value="right">COM_WEBLINKS_RIGHT</option>
 			<option value="left">COM_WEBLINKS_LEFT</option>
@@ -121,14 +121,12 @@
 			type="spacer"
 			hr="true"
 		/>
-
 		<field
-			id="show_tags"
 			name="show_tags"
 			type="radio"
+			label="COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			label="COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -143,8 +141,8 @@
 		<field
 			name="category_layout"
 			type="componentlayout"
-			class="form-select"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
+			class="form-select"
 			menuitems="true"
 			extension="com_weblinks"
 			view="category"
@@ -153,8 +151,8 @@
 		<field
 			name="show_category_title"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
 			label="JGLOBAL_SHOW_CATEGORY_TITLE"
+			layout="joomla.form.field.radio.switcher"
 			default="1"
 			>
 			<option value="0">JHIDE</option>
@@ -164,9 +162,9 @@
 		<field
 			name="show_description"
 			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -175,9 +173,9 @@
 		<field
 			name="show_description_image"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
-			default="1"
 			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+			layout="joomla.form.field.radio.switcher"
+			default="0"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -188,6 +186,7 @@
 			type="list"
 			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 			default="-1"
+			validate="options"
 			>
 			<option value="0">JNONE</option>
 			<option value="-1">JALL</option>
@@ -201,8 +200,8 @@
 		<field
 			name="show_empty_categories"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
 			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			layout="joomla.form.field.radio.switcher"
 			default="0"
 			>
 			<option value="0">JHIDE</option>
@@ -212,9 +211,9 @@
 		<field
 			name="show_subcat_desc"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
-			default="1"
 			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			default="1"
+			layout="joomla.form.field.radio.switcher"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -223,9 +222,9 @@
 		<field
 			name="show_cat_num_links"
 			type="radio"
+			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -251,9 +250,9 @@
 		<field
 			name="show_base_description"
 			type="radio"
+			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -262,9 +261,11 @@
 		<field
 			name="maxLevelcat"
 			type="list"
-			default="-1"
 			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			default="-1"
+			validate="options"
 			>
+			<option value="0">JNONE</option>
 			<option value="-1">JALL</option>
 			<option value="1">J1</option>
 			<option value="2">J2</option>
@@ -276,9 +277,10 @@
 		<field
 			name="show_empty_categories_cat"
 			type="radio"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="0"
-			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			showon="maxLevelcat:-1,1,2,3,4,5"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -287,20 +289,21 @@
 		<field
 			name="show_subcat_desc_cat"
 			type="radio"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			showon="maxLevelcat:-1,1,2,3,4,5"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
 		</field>
 
 		<field
-			name="show_cat_num_links_cat"
+			name="show_cat_num_articles_cat"
 			type="radio"
+			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -315,8 +318,8 @@
 		<field
 			name="filter_field"
 			type="list"
-			default="1"
 			label="JGLOBAL_FILTER_FIELD_LABEL"
+			default="1"
 			>
 			<option value="1">JSHOW</option>
 			<option value="hide">JHIDE</option>
@@ -397,9 +400,9 @@
 		<field
 			name="show_feed_link"
 			type="radio"
+			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -408,9 +411,8 @@
 		<field
 			name="custom_fields_enable"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
 			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
-			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			layout="joomla.form.field.radio.switcher"
 			default="0"
 		>
 			<option value="0">JNO</option>