Updated Controller and View. Work in progress
Merge pull request #2 from alexanderdavidpan/Controller_and_View

Updated Controller and View. Work in progress