Updated markup to be more semantic
Updated docs
Merge branch 'release/0.28.1' into develop