working on text changes - still need to refactor the templating part in html