Fix js/hbs to fit new ember
Changes to follow Ember guidelines