Removed extraneous toggles, changed legend