#105 Refactor the WYSIWYG

Noted. Let's make an enhancement issue out of it.