Better split view handling