Revert "Revert "Layout changes broke something, branching""

This reverts commit ca782f3057894d668841de130a04fa330d7a1eb1.
Revert "Revert "Revert "Layout changes broke something, branching"""

This reverts commit 4200b32f3c85399518f33288d3712896075fcce0.
Revert "WHY CAN"T I REVERT??"

This reverts commit b43b0c7b3c80f47f29cade9249934691615cdacd.