made some adjustments to widget lib