Added default page fixes