[Upg] Simplier markup

Reduce the legend markup in order to simplify stylesheet and markup