Forms added, some icons added, and others changes