Layout changes broke something, branching
WHY CAN"T I REVERT??
Revert "WHY CAN"T I REVERT??"

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

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

This reverts commit d19d71efbb55f04ea2833ea9de748c6c1f1caf25.