Added abstract display class
Fixes includes