Fixed #27 and header layout