refactored JS for widget
Merge branch 'develop'