Graphic & comments modifications