Fixes to UI issues (1035, 1086, 972, 970, 910)