Fix header size and nag padidng