added icons, overall clean up.