added icons and such