Fix headers so they properly align