BZ1008419 - Organizational Unit Manager: improve layout
(cherry picked from commit 414c57594dfc07007f7a0422b9f7281e2151d6b6)