added icons and some cleanup