Added Timepicker and Datepicker in create/edit dialog, Fix layout dialog