Refactor Submenu, add employement, fix search bar