Refactored and added handlebars views