Refactor menu and style it