merged widget changes into masteR