modify layout when date clomun is null
refactoring