More Changes including removing non-html list