Upgrade widget UI, Some code & comment changes