First refactor for split view