refactored templates
monday sprint
updated order template