HTML id fixes