Being a bad boy and rolling a small layout tweak into this feature branch