user flow and teplates updated