Animation Fix to mimic Mailbox App a little more

Also added some preprocessor directives for simpler adjustment of animation durations.