Improve callback calendar