Improvements to index.hbs