Refactored GraphicsHandler a bit