Fixed Inverse Control and refactor the draw method