Made some more improvements, but still crashes (on mobile)  when choosing 'add/create event'