Update hbs templates, fix grid sizes