Working on menu and fixing minor issues