Fixes to CollapsibleEditorBranch (not working yet)