adding calendar ! + style rework