Organising views a little bit better.