GUI-1373
tightened up layout