Menu page refactoring