Reverting "controls -> widgets"

This reverts commit 636a302284b26b21cd28e86dd8d48fbc157a6e5e.