add icon, form and other minor changes