fix counting and logo
Merge branch 'hotfix' into staging