Minor UI fix and WYSIWYG Double Instance Issue

Issue #392