fixes #2971 - Convert all output to be tabular

This is the core part