refactor menu a bit