updated all links to refactored form