Graphics cleanup before Pull-Request. And Axis + AxisAndGrid modules update.