Various controller and template changes