Dropdown browser changes

It's been quite a while since I last pulled changes from upstream. Checked that sbt test passed.