Improved layout header