Reinstated page movement to fix error with links
Switched to OOP style menu