Minor refactoring, new bugs
Adding icons
Merge branch 'master' into leaf-let-it