Fixed errors; added icons.