Update views and mod controllers
Use model in view model