Refactor menu and colors