Adding Data View plus tidy-up.