refactor order
fix 1 bug on cart
remove should and user present tense