Merge pull request #537 from LoungeKatt/master

Onscreen menu fixes and reduction
Move right stick setting to input options