Add more details to legend and clean up