Switched lots of ids to classes