Remove all Mso* classes
Added UL and OL