UI fixes for Release 0.16

Fixing a couple of late call UI issues.