Modified some singleton declaration and started working on GfxManager