Menu and help page clean-up