Resync'd UI and API