Some changes to the way it displays results
Displays results nicely now - merge conflicts resolved