Reverted to original SplitView implementation

Going to work out the SplitView stuff on a new breanch.