Implement decoration at calendar level + several bug fixes