Link Form Improvements

From #2197.