topbar fixes - part 3

chandi requested to merge topbar-fixes3 into master Jul 23, 2018