Fixes from cold review part 3 - UI mapping cleanup