Separated the menu options out
Changed things
Fixed crash
Added comment