Fix date
Set layout more clear