More top bar tweaks