WIP - View now appears almost as in original.