Upgrade widget UI, Some code & comment changes

Finished the UI changes