stabilize the refactoring of the widget/rapid architecture, part 1