more cosmetic fixes related to new top bar