Split views as per #12