Improvements

Removeable badges, highlighted border to indicate badge has been added