Fixing some toasts
Merge remote-tracking branch 'Jason/master'
Changes for the presentations