Put events back to master + more UI changes

1. class events can be found now
2. More minor UI changes on client