Merge pull request #207 from dcofer44/master

Upgrade widget UI, Some code & comment changes