Removed debug code
Fixed collapse open/close toggling