Files modified to work properly with the new widget