Continued fixing core html