Updated Settings with check for default page