split view cleanup and improvements