More fixes related to menu refactor