New Widgets - Minor fixes

Minor bug fix and new widgets