Updated the View and Controllers, used TBD model methods.