Dashboard fix
Merge branch 'hotfix/notification_widget_fix'