date picker and charges changes added