Added features to make widget less insular.