Fixed controller routing, added links