many improvements to calendar and some styles