More improvments in layout.