Modified source order in locations header which also fix layout issues.