Minor - cleaning code
Fixinh UI see BT#6493