Reorder logic & views
Fix events views for onir