Changed window layout and placement of components. Fixes NMS-7010