fix date picker, tax view