issue close #32
+ fixed datapicker
clean up