Fixed HTML id issues