Fixes most of the specs.

I think the remaining spec failures are mostly bootstrap markup changes that just need to be changed to reflect that.