Rewrote user stories for more clarity