Small fixes in layout components