Merge the "mode" param of View.display() into the "data" param
Refactor Tools so they return data objects instead of calling display() directly