Restructuring header for new layout