UI-G/19 and UI-G/20

Implemented both UI-G/19 and UI-G/20.  This commit also includes some
additional defect fixes listed in the defect tracking log.