Fix a few more minor bugs in browser, begin locating areas outside browser which will need refactoring