Added timepicker and made improvements to calendar