Date issue fixed, dropdown added