Improved badges, added badges dialog