Fixing the header bars, still not quite perfect