be consistent and make values in backend pristine, use views/templates to format/round
be consistent and make values in backend pristine, use views/templates to format/round
fix merge conflict