AJ-1573 more improvements to metric badge UI