add month select and fix data picker display