Fixed Calendar account transfer, UI fixes