Restyle header a bit, close #220