Fixed modal inconsistent fade problem

I tried a few solutions - this is the simplest solution I could come up with. I'd honestly rather not have such an inconsistent mix of JQuery and CSS animation as they collide a lot, but this does the job.

resolve #2400