UI-2657: Review relooking on all screen  - Fix some bug