Redesign

:+1:.  I think this is a separate bug we need to address in other places too.