Additional updates to default layout