diff --git a/advotracker/src/data/keys.rs b/advotracker/src/data/keys.rs
index fa28290..7df0dbe 100644
--- a/advotracker/src/data/keys.rs
+++ b/advotracker/src/data/keys.rs
@@ -9,53 +9,54 @@
 // https://github.com/ron-rs/ronRon
 
 // Classes
-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_TRANSPARENT: &str = "transparent";
-pub static CLASS_SEPERATOR: &str = "seperator";
+pub static CLASS_BOTTOM_BAR: &'static str = "bottom_bar";
+pub static CLASS_HEADER_BAR: &'static str = "header_bar";
+pub static CLASS_ITEM_BUTTON: &'static str = "item_button";
+pub static CLASS_MENU_BUTTON: &'static str = "menu_button";
+pub static CLASS_POLICY_CHECK_FORM: &'static str = "check_form";
+pub static CLASS_TEXT_BOX: &'static str = "text_box";
+pub static CLASS_TEXT_BLOCK: &'static str = "text_block";
+pub static CLASS_TRANSPARENT: &'static str = "transparent";
+pub static CLASS_SEPERATOR: &'static str = "seperator";
 
 // Widget IDs (DCES: Entity[id] => [Component1, .. ,  Component<n>] -> data or state)
-pub static ID_POLICY_CHECK_FORM: &str = "policy_check_form";
-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_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_WIDGET: &str = "policy_check_widget";
+pub static ID_POLICY_CHECK_FORM: &'static str = "policy_check_form";
+pub static ID_POLICY_CHECK_HEADER: &'static str = "policy_check_header";
+pub static ID_POLICY_CHECK_ITEMS_WIDGET: &'static str = "policy_check_items_widget";
+pub static ID_POLICY_CHECK_BUTTON_MENU: &'static str = "policy_check_button_menu";
+pub static ID_POLICY_CHECK_BUTTON_RESULT: &'static str = "policy_check_button_result";
+pub static ID_POLICY_CHECK_DATA_COUNT_BLOCK: &'static str = "policy_check_data_count_block";
+pub static ID_POLICY_CHECK_LABEL_MENU: &'static str = "policy_check_label_menu";
+pub static ID_POLICY_CHECK_LABEL_POLICY_NUMBER: &'static str = "policy_check_label_policy_number";
+pub static ID_POLICY_CHECK_LABEL_RESULT: &'static str = "policy_check_label_result";
+pub static ID_POLICY_CHECK_POLICY_NUMBER: &'static str = "policy_check_policy_number";
+pub static ID_POLICY_CHECK_PROGRESS_POPUP: &'static str = "policy_check_progress_popup";
+pub static ID_POLICY_CHECK_PROGRESS_BAR: &'static str = "policy_check_progress_bar";
+pub static ID_POLICY_CHECK_PROGRESS_TEXT: &'static str = "policy_check_progress_text";
+pub static ID_POLICY_CHECK_RESULT: &'static str = "policy_check_result";
+pub static ID_POLICY_CHECK_WIDGET: &'static 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_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";
-pub static ID_POLICY_DATA_POLICY_NUMBER: &str = "policy_data_policy_number";
-pub static ID_POLICY_DATA_STATUS: &str = "policy_data_status";
-pub static ID_POLICY_DATA_LIST_NAME: &str = "policy_data_list_name";
+pub static ID_POLICY_DATA_ADD_BUTTON: &'static str = "policy_data_add_button";
+pub static ID_POLICY_DATA_COUNT_BLOCK: &'static str = "policy_data_count_block";
+pub static ID_POLICY_DATA_ITEMS_WIDGET: &'static str = "policy_data_items_widget";
+pub static ID_POLICY_DATA_DATE_INSERTED: &'static str = "policy_data_date_inserted";
+pub static ID_POLICY_DATA_DION: &'static str = "policy_data_dion";
+pub static ID_POLICY_DATA_POLICY_CODE: &'static str = "policy_data_policy_code";
+pub static ID_POLICY_DATA_POLICY_NUMBER: &'static str = "policy_data_policy_number";
+pub static ID_POLICY_DATA_STATUS: &'static str = "policy_data_status";
+pub static ID_POLICY_DATA_LIST_NAME: &'static str = "policy_data_list_name";
 
-pub static ID_POLICY_LIST_ADD_BUTTON: &str = "policy_list_add_button";
-pub static ID_POLICY_LIST_ITEMS_WIDGET: &str = "policy_list_items_widget";
-pub static ID_POLICY_LIST_TEXT_BOX: &str = "policy_list_text_box";
+pub static ID_POLICY_LIST_ADD_BUTTON: &'static str = "policy_list_add_button";
+pub static ID_POLICY_LIST_ITEMS_WIDGET: &'static str = "policy_list_items_widget";
+pub static ID_POLICY_LIST_TEXT_BOX: &'static str = "policy_list_text_box";
 
 // Component Values (Properties)
-pub static PROP_ADVOTRACKER: &str = "advotracker";
-pub static PROP_POLICY_CHECK: &str = "policy_check";
+pub static PROP_ADVOTRACKER: &'static str = "advotracker";
+pub static PROP_POLICY_CHECK: &'static str = "policy_check";
+pub static PROP_POLICY_PROGRESS_COUNT: &'static str = "policy_progress_count";
 
-pub static PROP_POLICY_DATA_LIST: &str = "policy_data_list";
-pub static PROP_POLICY_DATA_COUNT: &str = "policy_data_count";
+pub static PROP_POLICY_DATA_LIST: &'static str = "policy_data_list";
+pub static PROP_POLICY_DATA_COUNT: &'static str = "policy_data_count";
 
-pub static PROP_POLICY_LIST: &str = "policy_list";
-pub static PROP_POLICY_LIST_COUNT: &str = "policy_list_count";
+pub static PROP_POLICY_LIST: &'static str = "policy_list";
+pub static PROP_POLICY_LIST_COUNT: &'static str = "policy_list_count";