Merge pull request #3 from aliab/ui

Ui
Version v0.8.4 fix bugs and update UI
fix conflicts
Merge branch 'master' into ui
fix pull request and clean up code