Tidy up, adding badge icons, utils