Refactor the views and their integration tests. Update the layout and views to use partials for many of the repetetive parts.