PMO-2710: some layouting problems solved