[Added] Legend, minor layout changes