Adjust legend toggles. Fixes #10 and Fixed #9