#8
Some fixes
Added icons