More refactoring of widgets after finding some of it was missing while
writing tutorial for widgets