Code Organization and Menu Changes

Re-organized code and fixed variable names. Moved menu buttons to
appropriate locations. Still having issues with hitting esc while in
Instructions to go back to menu.