clean up design and add icons