Had a shuffle around, a bit of organising, and added some icons