Develop

Improvements Graphics component by team 2