Added ContainerOnly button
Improve branch collapsing