Fixed bugs after cross browser testing