Improve consistency between demos and slides