Improvement of MSA widget.