BZ1008419 - Organizational Unit Manager: improve layout