Data for the presentation
Some formatting in the dashboard
Merged conflict