I fixed the default week selection as well as saving the date