Improving UI see BT#5768