Reordered date picker & changed years