Form and Link Fixes