Various changes
Add widget lib only if needed