made menu easier to read
Merge branch 'master' into ryan