Merge "Polish edit mode UI for BC25" into main