Moved display from model to view