[Upg] Simplier markup

Reduce the legend markup in order to simplify stylesheet and markup
Merge pull request #1 from loranger/master

Simplified markup