Cross browser updates

fixed issues with firefox