Reapplied some of Kenny's changes to index.hbs