Defect Fixes and implemented new functionality

Fixed a couple defects (recorded in defect tracking log) and added
implementation for UI-G/8 and UI-G/13