UI tweaks, added legend