Make update forms more consistent