avoid high cost rendering in widget.Modal (Related to #95)
Merge branch 'hotfix/widget-modal-optimization'