add tidy up and an icon