fix controller and links