diff --git a/frontend/src/keys.rs b/frontend/src/keys.rs
index dd23411..ec86e34 100644
--- a/frontend/src/keys.rs
+++ b/frontend/src/keys.rs
@@ -1,27 +1,41 @@
 // CSS => transform to RON based theme system
 // https://github.com/ron-rs/ronRon
+
+// Classes
 pub static CLASS_BOTTOM_BAR: &str = "bottom_bar";
-pub static CLASS_HEADER: &str = "header";
+pub static CLASS_HEADER: &str = ".my_header";
 pub static CLASS_ICON_ONLY: &str = "icon_only";
 pub static CLASS_ITEM_BUTTON: &str = "item_button";
+pub static CLASS_MENU: &str = "menu";
+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 ID_POLICY_CHECK_WIDGET: &str = "policy_check_widget";
-pub static ID_POLICY_CHECK_TEXT_BOX: &str = "policy_check_text_box";
+pub static CLASS_SEPERATOR: &str = "seperator";
+
+// 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_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_BUTTON: &str = "policy_check_menu_button";
-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_CHECK_MENU_CONTAINER: &str = "policy_check_menu_container";
+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_WIDGET: &str = "policy_check_widget";
 pub static ID_POLICY_DATA_ADD_BUTTON: &str = "policy_data_add_button";
 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_LISTS_ADD_BUTTON: &str = "policy_lists_add_button";
+pub static ID_POLICY_LISTS_ITEMS_WIDGET: &str = "policy_lists_items_widget";
+pub static ID_POLICY_LISTS_TEXT_BOX: &str = "policy_list_text_box";
 
-// Properties == DCES: Entity[id] => [Component1, .. ,  Component<n>] -> data or state
+// Component Values (Properties)
 pub static PROP_POLICY_CHECK: &str = "policy_check";
 pub static PROP_POLICY_CODE: &str = "policy_code";
 pub static PROP_POLICY_ELEMENT: &str = "policy_element";
-pub static PROP_POLICY_LIST: &str = "policy_list";
-pub static PROP_POLICY_LIST_COUNT: &str = "policy_list_count";
+pub static PROP_POLICY_LISTS: &str = "policy_lists";
+pub static PROP_POLICY_DATA: &str = "policy_data";
+pub static PROP_POLICY_LISTS_COUNT: &str = "policy_lists_count";
 pub static PROP_POLICY_DATA_COUNT: &str = "policy_data_count";