Simplifier markup

I did apply some tiny modifications in order to reduce the legend markup and simplify stylesheet