IMPROVED: minor changes to adapt hint text to new component labels