top-bar fixes