[css, templates, data] updating work
merge