Revision 4

Changed menu options, fixed cancel event not working