Faster compile times, use forward declaration instead of including header. Also fix display bug