topbar fixes - part 4

chandi requested to merge topbar-fixes4 into master Aug 03, 2018