WIP on admin UI widgetization followup