fixes many img
Merge branch 'feature/crumbler-102' into staging