Improved ui, heading, legend