update to ui
resolved conflicts
Merge branch 'dev' of github.com:knagra/farnsworth into dev