Refactored views.
Added Comments