Moved display into separate class