form improve and add icon