some design changes
Merge branch 'master' of github.com:dab-cscart/zuubo