fixes to default layout