Really really really fixing the topbar