Break things out into proper views