improve calendar picker