UIC menu refactoring