Widget fix
Merge branch 'hotfix/dashbaord_fix'