not sure why this collapses vertically sometimes, but this should prevent it
Merge branch 'origin/uiTweaks1'