Adding alerts to show view
db
Merge branch 'devbli' into dev