Remapping and some UI updates.