Figure and AxisDecorator added