Few more fixes (menu, comments)