diff --git a/advotracker/src/data/keys.rs b/advotracker/src/data/keys.rs
index b4fb0ea..f81a8bf 100644
--- a/advotracker/src/data/keys.rs
+++ b/advotracker/src/data/keys.rs
@@ -17,17 +17,18 @@ pub static CLASS_SEPERATOR: &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_ITEMS_WIDGET: &str = "policy_check_items_widget";
 pub static ID_POLICY_CHECK_CLEAR_BUTTON: &str = "policy_check_clear_button";
 pub static ID_POLICY_CHECK_MENU_BUTTON: &str = "policy_check_menu_button";
 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_MENU_TEXT_BLOCK: &str = "policy_check_menu_text_block";
-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";
@@ -42,8 +43,8 @@ pub static ID_POLICY_LIST_ITEMS_WIDGET: &str = "policy_list_items_widget";
 pub static ID_POLICY_LIST_TEXT_BOX: &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_POLICY_CHECK_LIST: &str = "policy_check_list";
 
 pub static PROP_POLICY_DATA_LIST: &str = "policy_data_list";
 pub static PROP_POLICY_DATA_COUNT: &str = "policy_data_count";