WIP - Fix ordered lists and table columns