Split view issues solving (not finished, but better)