General fixes for new html