Fixed button bug and improved menu
Merge branch 'master' of https://github.com/reinei/Adventure