add icon and minor changes
Merge branch 'hack_chris' into jui
Merge branch 'jui'