Defect fixes and start of implementation for UI-G/9

Began implementation for UI-G/9 and fixed some other defects (noted in
the defect tracking log).