Fix calendar display bugs