More graphic refactoring