user build flow and teplates updated