Fixes to default page
Template fixes