Implemented cross browser fixes