Calendar functionality improved