Various top-bar fixes