Unified our expand collapse to be in line with Studio's