Re-org tag and calendar template