a few changes in default.hbs and index.hbs markup