Safari modal changes

Goes with internal PR.

@sdougbrown @nilnilnil