Added Data Persistence and fixed date display