correct links and controller variables