Fix a bug in the date
Update the tooltip
Merge branch 'develop'