added icons and some changes