Remake the menu totally to be more efficient