add icons and such