Changes to the Widget Page

PR-908, PR-909, PR-910,