did some rearanging
added datetime picker