Update view and controller
Fixed merge conflicts