added icons and made some other changes