Editor now correctly handles wysiwyg editor, improved layout