Work out some of the view issues by reorganizing a bit.