added icons and stuffs