Fixed auto date issue and data not saved

Finalized, show to mid-user later for review purpose