Add a default page
Improved a few the presentation in the event list
Fixing merge conflicts