Refactored views.

Added Comments