Revert "Refactor widgets"

Authored by wojnilowicz on Nov 15 2017, 3:48 PM.