move the options button into the main menu
remove some un-needed error checking