Issue #2274823 by eshta: Updated control links to match simplified UI structure.