Improve widget tags.  Added two todo messages to improve customization.