new layouts, fixes