cleanup code and add icons