Made header a bit more compact