Refactoring and adding html editor
Improvements for html editor