Added minor syntax changes to controller and templates