Fixed minor issues with calendar display