Refactored and added more views @leamars @nsford