Split View Cosmetic Tweaks.

Split view cosmetic tweaks plus fix for #8974.