diff --git a/interface/web/themes/default/css/css/iehacks.css b/interface/web/themes/default/css/iehacks.css
similarity index 100%
rename from interface/web/themes/default/css/css/iehacks.css
rename to interface/web/themes/default/css/iehacks.css
diff --git a/interface/web/themes/default/css/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/interface/web/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to interface/web/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/interface/web/themes/default/css/css/images/ui-bg_flat_55_fbec88_40x100.png b/interface/web/themes/default/css/images/ui-bg_flat_55_fbec88_40x100.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-bg_flat_55_fbec88_40x100.png
rename to interface/web/themes/default/css/images/ui-bg_flat_55_fbec88_40x100.png
diff --git a/interface/web/themes/default/css/css/images/ui-bg_glass_75_d0e5f5_1x400.png b/interface/web/themes/default/css/images/ui-bg_glass_75_d0e5f5_1x400.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-bg_glass_75_d0e5f5_1x400.png
rename to interface/web/themes/default/css/images/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/interface/web/themes/default/css/css/images/ui-bg_glass_85_dfeffc_1x400.png b/interface/web/themes/default/css/images/ui-bg_glass_85_dfeffc_1x400.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-bg_glass_85_dfeffc_1x400.png
rename to interface/web/themes/default/css/images/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/interface/web/themes/default/css/css/images/ui-bg_glass_95_fef1ec_1x400.png b/interface/web/themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-bg_glass_95_fef1ec_1x400.png
rename to interface/web/themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/interface/web/themes/default/css/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/interface/web/themes/default/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
rename to interface/web/themes/default/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/interface/web/themes/default/css/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/interface/web/themes/default/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
rename to interface/web/themes/default/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/interface/web/themes/default/css/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/interface/web/themes/default/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to interface/web/themes/default/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/interface/web/themes/default/css/css/images/ui-icons_217bc0_256x240.png b/interface/web/themes/default/css/images/ui-icons_217bc0_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-icons_217bc0_256x240.png
rename to interface/web/themes/default/css/images/ui-icons_217bc0_256x240.png
diff --git a/interface/web/themes/default/css/css/images/ui-icons_2e83ff_256x240.png b/interface/web/themes/default/css/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-icons_2e83ff_256x240.png
rename to interface/web/themes/default/css/images/ui-icons_2e83ff_256x240.png
diff --git a/interface/web/themes/default/css/css/images/ui-icons_469bdd_256x240.png b/interface/web/themes/default/css/images/ui-icons_469bdd_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-icons_469bdd_256x240.png
rename to interface/web/themes/default/css/images/ui-icons_469bdd_256x240.png
diff --git a/interface/web/themes/default/css/css/images/ui-icons_6da8d5_256x240.png b/interface/web/themes/default/css/images/ui-icons_6da8d5_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-icons_6da8d5_256x240.png
rename to interface/web/themes/default/css/images/ui-icons_6da8d5_256x240.png
diff --git a/interface/web/themes/default/css/css/images/ui-icons_cd0a0a_256x240.png b/interface/web/themes/default/css/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-icons_cd0a0a_256x240.png
rename to interface/web/themes/default/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/interface/web/themes/default/css/css/images/ui-icons_d8e7f3_256x240.png b/interface/web/themes/default/css/images/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-icons_d8e7f3_256x240.png
rename to interface/web/themes/default/css/images/ui-icons_d8e7f3_256x240.png
diff --git a/interface/web/themes/default/css/css/images/ui-icons_f9bd01_256x240.png b/interface/web/themes/default/css/images/ui-icons_f9bd01_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/css/images/ui-icons_f9bd01_256x240.png
rename to interface/web/themes/default/css/images/ui-icons_f9bd01_256x240.png
diff --git a/interface/web/themes/default/css/css/jquery-ui-1.8.16.custom.css b/interface/web/themes/default/css/jquery-ui-1.8.16.custom.css
similarity index 100%
rename from interface/web/themes/default/css/css/jquery-ui-1.8.16.custom.css
rename to interface/web/themes/default/css/jquery-ui-1.8.16.custom.css
diff --git a/interface/web/themes/default/css/css/print.css b/interface/web/themes/default/css/print.css
similarity index 100%
rename from interface/web/themes/default/css/css/print.css
rename to interface/web/themes/default/css/print.css
diff --git a/interface/web/themes/default/css/css/styles.css b/interface/web/themes/default/css/styles.css
similarity index 100%
rename from interface/web/themes/default/css/css/styles.css
rename to interface/web/themes/default/css/styles.css
diff --git a/interface/web/themes/default/icons/icons/button_sprite.png b/interface/web/themes/default/icons/button_sprite.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/button_sprite.png
rename to interface/web/themes/default/icons/button_sprite.png
diff --git a/interface/web/themes/default/icons/icons/device_sprite.png b/interface/web/themes/default/icons/device_sprite.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/device_sprite.png
rename to interface/web/themes/default/icons/device_sprite.png
diff --git a/interface/web/themes/default/icons/icons/flags_sprite.png b/interface/web/themes/default/icons/flags_sprite.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/flags_sprite.png
rename to interface/web/themes/default/icons/flags_sprite.png
diff --git a/interface/web/themes/default/icons/icons/x16/arrow.png b/interface/web/themes/default/icons/x16/arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/x16/arrow.png
rename to interface/web/themes/default/icons/x16/arrow.png
diff --git a/interface/web/themes/default/icons/icons/x16/arrow_180.png b/interface/web/themes/default/icons/x16/arrow_180.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/x16/arrow_180.png
rename to interface/web/themes/default/icons/x16/arrow_180.png
diff --git a/interface/web/themes/default/icons/icons/x16/arrow_stop.png b/interface/web/themes/default/icons/x16/arrow_stop.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/x16/arrow_stop.png
rename to interface/web/themes/default/icons/x16/arrow_stop.png
diff --git a/interface/web/themes/default/icons/icons/x16/arrow_stop_180.png b/interface/web/themes/default/icons/x16/arrow_stop_180.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/x16/arrow_stop_180.png
rename to interface/web/themes/default/icons/x16/arrow_stop_180.png
diff --git a/interface/web/themes/default/icons/icons/x16/cross_circle.png b/interface/web/themes/default/icons/x16/cross_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/x16/cross_circle.png
rename to interface/web/themes/default/icons/x16/cross_circle.png
diff --git a/interface/web/themes/default/icons/icons/x16/tick_circle.png b/interface/web/themes/default/icons/x16/tick_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/x16/tick_circle.png
rename to interface/web/themes/default/icons/x16/tick_circle.png
diff --git a/interface/web/themes/default/icons/icons/x16_sprite.png b/interface/web/themes/default/icons/x16_sprite.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/x16_sprite.png
rename to interface/web/themes/default/icons/x16_sprite.png
diff --git a/interface/web/themes/default/icons/icons/x32_sprite.png b/interface/web/themes/default/icons/x32_sprite.png
similarity index 100%
rename from interface/web/themes/default/icons/icons/x32_sprite.png
rename to interface/web/themes/default/icons/x32_sprite.png
diff --git a/interface/web/themes/default/images/images/ajax-loader.gif b/interface/web/themes/default/images/ajax-loader.gif
similarity index 100%
rename from interface/web/themes/default/images/images/ajax-loader.gif
rename to interface/web/themes/default/images/ajax-loader.gif
diff --git a/interface/web/themes/default/images/images/buttonHolder_bg.gif b/interface/web/themes/default/images/buttonHolder_bg.gif
similarity index 100%
rename from interface/web/themes/default/images/images/buttonHolder_bg.gif
rename to interface/web/themes/default/images/buttonHolder_bg.gif
diff --git a/interface/web/themes/default/images/images/chevron.png b/interface/web/themes/default/images/chevron.png
similarity index 100%
rename from interface/web/themes/default/images/images/chevron.png
rename to interface/web/themes/default/images/chevron.png
diff --git a/interface/web/themes/default/images/images/favicon.ico b/interface/web/themes/default/images/favicon.ico
similarity index 100%
rename from interface/web/themes/default/images/images/favicon.ico
rename to interface/web/themes/default/images/favicon.ico
diff --git a/interface/web/themes/default/images/images/header_bg.png b/interface/web/themes/default/images/header_bg.png
similarity index 100%
rename from interface/web/themes/default/images/images/header_bg.png
rename to interface/web/themes/default/images/header_bg.png
diff --git a/interface/web/themes/default/images/images/header_logo.png b/interface/web/themes/default/images/header_logo.png
similarity index 100%
rename from interface/web/themes/default/images/images/header_logo.png
rename to interface/web/themes/default/images/header_logo.png
diff --git a/interface/web/themes/default/images/images/lists_tfoot_bg.png b/interface/web/themes/default/images/lists_tfoot_bg.png
similarity index 100%
rename from interface/web/themes/default/images/images/lists_tfoot_bg.png
rename to interface/web/themes/default/images/lists_tfoot_bg.png
diff --git a/interface/web/themes/default/images/images/lists_thead_bg.png b/interface/web/themes/default/images/lists_thead_bg.png
similarity index 100%
rename from interface/web/themes/default/images/images/lists_thead_bg.png
rename to interface/web/themes/default/images/lists_thead_bg.png
diff --git a/interface/web/themes/default/images/images/loading.gif b/interface/web/themes/default/images/loading.gif
similarity index 100%
rename from interface/web/themes/default/images/images/loading.gif
rename to interface/web/themes/default/images/loading.gif
diff --git a/interface/web/themes/default/images/images/meter_bg.gif b/interface/web/themes/default/images/meter_bg.gif
similarity index 100%
rename from interface/web/themes/default/images/images/meter_bg.gif
rename to interface/web/themes/default/images/meter_bg.gif
diff --git a/interface/web/themes/default/images/images/screen_bg.png b/interface/web/themes/default/images/screen_bg.png
similarity index 100%
rename from interface/web/themes/default/images/images/screen_bg.png
rename to interface/web/themes/default/images/screen_bg.png
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index e59a24fb5ee264d0ed395340042e9607caafcfcb..a96c876772e173fccbbca66f4369fc58d2236042 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -43,14 +43,22 @@
                 });
                 
                 jQuery('.ttip').tipsy({live: true, gravity: 'ne', html: true});
+                
+                tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled>';
+                tabChangeWarningTxt = '<tmpl_var name="global_tabchange_warning_txt">';
             });
             
             
             jQuery(document).bind("change", function(event) {
-                if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
+                var elName = event.target.localName;
+                if (jQuery(".panel #Filter").length > 0 && elName == 'select') {
                     event.preventDefault();
                     jQuery(".panel #Filter").trigger('click');
                 }
+                if(elName == 'select' || elName == 'input' || elName == 'textarea') {
+                    // set marker that something was changed
+                    pageFormChanged = true;
+                }
             });
             
             jQuery(document).bind("keypress", function(event) {