Better layout for badges