bug fix
refactoring
take out handlebars
update time refactoring
refactoring