Added Date and Time pickers, new tables