refactor client code
got icon'd
got icon'd
done with app mode