Changed js wysiwyg
Merge and js html editor mess