fixing balance UI
Merge branch 'soulmatt'
fix issue7
Merge branch 'code-merge'