Re-arranged date boxes