Little changes to improve display when setting.