merged redundant templates, added new dateime picker