Menu bug fixes

Closes #7 and #8.