Undo esc_html and fix class name

Fixes #2488