Separate view concerns and fix whitespace