Improved header look and round-ending