cleaning menu stuff, closes #8