Menu and default page fixes
Default and menu page fixes