Fix content structure