Improved display class