Updated Controller and View. Work in progress