bugid-100496 | Wam on homepage - templating fixes after design review