add color picker and fix date picker