Refactored the views