refactor for inline custom fields view #430