began refactor
improvements to UI and firefox bug fix
Merge branch 'ui'