Some more refactoring of the views.