Improve usability, fix bugs
Add icons
Fix bug with collateral
Merge remote-tracking branch 'origin/master' into natives
Merge branch 'master' into native
 Please enter a commit message to explain why this merge is necessary,