UI mods and crash and fixed crash when canceling rearrange and swapping orientation