Browser Changes

- See commits below
- Due to weird mergin problems, some of the commits from my last pull request are shown again. If that means any trouble for you, just reject the pull request and I'll try to reset and make some clean commits