Fix for menu and pages