Ttied to fix data saving, date fix, small layout fixes