Widget added and improved