Fixing Layout Issue with Calendar