Fix show/hide on widget
Small changes
Support function expressions