Merge pull request #250 from samuelmaddock/master

Fixed misc menu issues