Merge "Tweaking CSS of badge display per Vibha'a design"