Revert "Revert "New and improved layouts""

This reverts commit c67fe00a95254d03a0e0c80911024f7e6a92f69e.