Overhauled the Graphics + CleanUp