Improved visual appearance of legend
Reordered UI