IWysiwygToolbar is added, code clean up 

IWysiwygToolbar is added, code clean up