Revert "Revert "Reverted to original SplitView implementation""

This reverts commit 4c46f4d717a6e86b684ed017f73c9f89ce1174ae.
Revert "Reverted to original SplitView implementation"

This reverts commit b20ce6e9a5baa8651ded0f345e8a777b7d575787.