improve forms while editing