More menu stuff

-Steven
Merge branch 'master' of https://github.com/Alchai/Tempus