Fixed 99% of calculator presentation animation errors
Merge remote-tracking branch 'origin/master'