Some minor cleaning up [ci skip].
Some work on moving some widgets to their own plugin from the Core plugin (#396) [ci skip].