Better markup and style in the header