Even more work on sync UI