Added icon and form renderer