Added date
Added more button rules for the overview page