More work on these partials and views.