Merge "Improving display of birthdays"