fixed logout issue
fixed calendar bug