Fixing some bugs in dashboard and events