tidying up and adding icons