EDX-221: Fix UI

EDX-221: Fix UI
Ally Operation Team's advices