Fixed more links in topbar