Slight refactor of views