Added options menu
Fixed options text
Options menu stuff
Merge branch 'Austin'