few arangments on user journey