Updated with proper legend, drop-down toggles