NS module: again improved layout of plan results.
Merge remote-tracking branch 'parent/master'