fixed datepicker and cleaned up views