diff --git a/advotracker/src/data/keys.rs b/advotracker/src/data/keys.rs
index fc08672..fa28290 100644
--- a/advotracker/src/data/keys.rs
+++ b/advotracker/src/data/keys.rs
@@ -9,14 +9,13 @@
 // https://github.com/ron-rs/ronRon
 
 // Classes
-pub static CLASS_FOOTER: &str = "footer";
-pub static CLASS_HEADER: &str = "header";
+pub static CLASS_BOTTOM_BAR: &str = "bottom_bar";
+pub static CLASS_HEADER_BAR: &str = "header_bar";
 pub static CLASS_ITEM_BUTTON: &str = "item_button";
 pub static CLASS_MENU_BUTTON: &str = "menu_button";
 pub static CLASS_POLICY_CHECK_FORM: &str = "check_form";
 pub static CLASS_TEXT_BOX: &str = "text_box";
 pub static CLASS_TEXT_BLOCK: &str = "text_block";
-pub static CLASS_TOP_BAR: &str = "top_bar";
 pub static CLASS_TRANSPARENT: &str = "transparent";
 pub static CLASS_SEPERATOR: &str = "seperator";
 
@@ -26,21 +25,20 @@ pub static ID_POLICY_CHECK_HEADER: &str = "policy_check_header";
 pub static ID_POLICY_CHECK_ITEMS_WIDGET: &str = "policy_check_items_widget";
 pub static ID_POLICY_CHECK_BUTTON_MENU: &str = "policy_check_button_menu";
 pub static ID_POLICY_CHECK_BUTTON_RESULT: &str = "policy_check_button_result";
+pub static ID_POLICY_CHECK_DATA_COUNT_BLOCK: &str = "policy_check_data_count_block";
+pub static ID_POLICY_CHECK_LABEL_MENU: &str = "policy_check_label_menu";
 pub static ID_POLICY_CHECK_LABEL_POLICY_NUMBER: &str = "policy_check_label_policy_number";
 pub static ID_POLICY_CHECK_LABEL_RESULT: &str = "policy_check_label_result";
 pub static ID_POLICY_CHECK_POLICY_NUMBER: &str = "policy_check_policy_number";
-pub static ID_POLICY_CHECK_PROGRESS_POPUP: &str = "policy_check_progress_popup";
+pub static ID_POLICY_CHECK_PROGRESS_BOX: &str = "policy_check_progress_box";
 pub static ID_POLICY_CHECK_PROGRESS_BAR: &str = "policy_check_progress_bar";
 pub static ID_POLICY_CHECK_PROGRESS_TEXT: &str = "policy_check_progress_text";
 pub static ID_POLICY_CHECK_RESULT: &str = "policy_check_result";
-pub static ID_POLICY_CHECK_POLICY_NUMBER: &str = "policy_check_policy_number";
-pub static ID_POLICY_CHECK_RESULT: &str = "policy_check_result";
 pub static ID_POLICY_CHECK_WIDGET: &str = "policy_check_widget";
 
 pub static ID_POLICY_DATA_ADD_BUTTON: &str = "policy_data_add_button";
 pub static ID_POLICY_DATA_COUNT_BLOCK: &str = "policy_data_count_block";
 pub static ID_POLICY_DATA_ITEMS_WIDGET: &str = "policy_data_items_widget";
-//pub static ID_POLICY_DATA_TEXT_BOX: &str = "policy_data_text_box";
 pub static ID_POLICY_DATA_DATE_INSERTED: &str = "policy_data_date_inserted";
 pub static ID_POLICY_DATA_DION: &str = "policy_data_dion";
 pub static ID_POLICY_DATA_POLICY_CODE: &str = "policy_data_policy_code";