Small fixes to events and Dashboard
Merge pull request #2 from Zichsah/noah

Small fixes to events and Dashboard