Some tweaks for html to work in editor