More top bar fixes