Makes the structure of the views a bit more sane :P