Convert to new style displays. Much cleaner.