Trying to kill bugs
Fixed non-closing calendar error