replaced Handlebars with Rivets