Made Calendar clicking beter