Improve usability, fix bugs
Add icons
Fix bug with collateral
Merge branch 'master' into native
Merge branch 'native' into icons