Update controllers and templates to fix bugs
Update changes to reflect bug fixes