fix indentation and remove popup tip from edit form