UI-2897 CLV - Editing Toolbar doesnt display well