Topbar + typography fixes