Added links and controllers