Added categorization (submenu) + refactored searchbar