improvements to default layout