Axis and Button class refactored