Added Dates and pickers/loaders acordingly