Added datePicker and new layout