Refactored the Views