Missed a couple of id/class swaps