Remove duplicate switch to display calendar
Having the same switch in two places is pretty confusing. The placement of the switch inside the calendar page is also suboptimal. I propose Calendar changes to Settings' metaphor of displaying a dim label to indicate the status of whether a calendar is displayed or not.
I've used "Enabled/Disabled" in this mockup, as both "Displayed" and "Shown" feel awkward. If we want to keep the "Enabled/Disabled" labeling, a prerequisite for this proposal would be changing the behavior of this switch. (The calendar hiding everywhere rather than just in specific places)
Edited by Jamie Gravendeel