WYSIWYG issue solved
Minor bug fixed