Collapsible controls + a bugfix.