Major Refactoring of Model Display

In preparation for ranking system.