Added content to edit and made form partial compatible with both edit and new (diff vars set)