Refactors rest of views.