Move display stuff into display class