Moving display context to new Display class