Fix controller and index templates