fix flash messages
fix close notifications
Merge branch 'feature/notifications' into develop

* feature/notifications:
  fix close notifications
  fix flash messages