First pass at badge improvements