Labels are now correct
Final fixes
Final fixes
Reverted last commit
This was what went for the presentation.

And it was good....