UI: Right column cleanup on layout switch