Order list, html bugfixes