Restructured header and content