Remove on-stage editing for text and popup as it will remove the formatting added by ckeditor.