Update controllers and templates view
Resolve merge conflicts