Revert "Layout fixes"

This reverts commit 3fb7d9517563d3b3c4edd7f677967ee333ee7013.