Fixed bug in hbs layout