Repaired heading issues