initial fixes to pass bridge tests
minor fixes
fixed UI bugs
Merge pull request #46 from mikeedwards/bridge-test-fix

Bridge UI and test fixes