Reworked more of the markup (turning ids into classes and removing some classes)
Updated docs
Merge branch 'release/0.22.8' into develop