UI fix for dates