fixed url and link errors for custom forms, pending extra redirect links & further clean up