Missing link and separator fixes in forms