Minor updates to menu. And by the way: menu handling is done from module declarations now.