Badge UI fixes