Improve patching os unsupported browser, shufle things around a bit