Default and menu page fixes