Legend tweaks, info display logic changes