Widget improvemnets