Removing data structure from views

- Second time around..

@Demwunz @stevegraham  Can you review and merge this sooner rather than later please.

I did it exactly the same as the last time.