More of the same as last commit

In regards to display() and restructuring.