Calendar/Task Styling, Bug fixes