Some menu fixing up, with Ricky updated buttons.
Merge branch 'master' of https://github.com/klgilbert/avm