Fixed controller and templates