Starting to do the menu and did some changes