Swap to table output

Port over the output to use a CLI table for readability