UI changes

Makes several UI changes requested by AnthroCon.
I can't think of a good name for this function.  ``badge_type_with_ribbon`` is misleading given the actual semantics (i.e. we don't show the badge type if it's an attendee badge with a ribbon), but I really can't think offhand of a better name :/