Refactor some widget stuff. Start to remove unnecessary classes