added icons and stuff