Updated view. Refactored ListController
Fixed merge conflict.