Refactor of views.
Nothing major