Improvements in variables widget