diff --git a/app/(interactive)/matches/[slug]/page.js b/app/(interactive)/matches/[slug]/page.js
index f95e1f6..1072ff8 100644
--- a/app/(interactive)/matches/[slug]/page.js
+++ b/app/(interactive)/matches/[slug]/page.js
@@ -119,10 +119,10 @@ const MatchPage = () => {
     setFilterList(updatedFilterList);
   };
 
-  const scrollToDetailedList=()=>{
+  const scrollToDetailedList = () => {
     if (tableRef.current) {
       tableRef.current.scrollIntoView({ behavior: "smooth" });
-  }
+    }
   };
 
   const togglePDF = () => {
@@ -140,7 +140,7 @@ const MatchPage = () => {
       {/* Main Content Area */}
       {matchData && (
         <>
-          <MatchTiles matchName={matchData.name} clientTeam={matchData.clientTeam} opponentTeam={matchData.opponentTeam} matchDetails={matchData.matchDetails} {...matchSetScores}/>
+          <MatchTiles matchName={matchData.name} clientTeam={matchData.clientTeam} opponentTeam={matchData.opponentTeam} matchDetails={matchData.matchDetails} {...matchSetScores} />
           <div className={styles.headerRow}>
             <div className={styles.titleContainer}>
               <h2>{matchData.name}</h2>
@@ -213,29 +213,29 @@ const MatchPage = () => {
                 <div className='jumpList'>
                   {/* Points List */}
                   <div className="pointsList">
-                    <PointsList pointsData={returnFilteredPoints()} onPointSelect={handleJumpToTime} clientTeam={matchData.clientTeam} opponentTeam={matchData.opponentTeam}/>
+                    <PointsList pointsData={returnFilteredPoints()} onPointSelect={handleJumpToTime} clientTeam={matchData.clientTeam} opponentTeam={matchData.opponentTeam} />
                   </div>
                   <div style={{ padding: '0.5vw', paddingLeft: '5vw' }}>
-                  <button className={styles.viewDetailedListButton} onClick={() => scrollToDetailedList()}>View Detailed List</button>
-                </div>
+                    <button className={styles.viewDetailedListButton} onClick={() => scrollToDetailedList()}>View Detailed List</button>
+                  </div>
                   {/* Score display */}
                   <div className="scoreboard">
-                    <ScoreBoard names={matchData.name} playData={playingPoint} {...matchSetScores}/>
+                    <ScoreBoard names={matchData.name} playData={playingPoint} {...matchSetScores} />
                   </div>
                 </div>
               </div>
             </div>
           </div>
           <div className={styles.toggle}>
-              <button onClick={() => togglePDF()} className={showPDF ? styles.toggle_buttona_inactive : styles.toggle_buttona_active}>Points</button>
-              <button onClick={() => togglePoints()} className={showPDF ? styles.toggle_buttonb_active : styles.toggle_buttonb_inactive}>Key Stats & Visuals</button>
+            <button onClick={() => togglePDF()} className={showPDF ? styles.toggle_buttona_inactive : styles.toggle_buttona_active}>Points</button>
+            <button onClick={() => togglePoints()} className={showPDF ? styles.toggle_buttonb_active : styles.toggle_buttonb_inactive}>Key Stats & Visuals</button>
             {showPDF ? (
               <iframe className={styles.pdfView} src={matchData.pdfUrl} width="90%" height="1550" />
             ) : (
               <div ref={tableRef} className={styles.ExtendedList}>
-                <ExtendedList pointsData={returnFilteredPoints()} clientTeam={matchData.clientTeam} opponentTeam={matchData.opponentTeam} onPointSelect={handleJumpToTime} iframe = {iframeRef}/>
+                <ExtendedList pointsData={returnFilteredPoints()} clientTeam={matchData.clientTeam} opponentTeam={matchData.opponentTeam} onPointSelect={handleJumpToTime} iframe={iframeRef} />
               </div>
-            )} 
+            )}
           </div>
         </>
       )}
diff --git a/app/(interactive)/tag-match/[slug]/page.js b/app/(interactive)/tag-match/[slug]/page.js
index 3a9696b..4a7d9a9 100644
--- a/app/(interactive)/tag-match/[slug]/page.js
+++ b/app/(interactive)/tag-match/[slug]/page.js
@@ -53,6 +53,7 @@ export default function TagMatch() {
       }
 
       // Set the metadata to matchDocument but without the 'points'
+      // eslint-disable-next-line no-unused-vars
       const { points, ...metadata } = matchDocument;
       setMatchMetadata(metadata);
     });
@@ -362,7 +363,7 @@ export default function TagMatch() {
     console.log("event: ", event);
     const courtWidthInInches = 432; // The court is 36 feet wide, or 432 inches
     // const courtHeightInInches = 936; // The court is 78 feet long, or 936 inches
-    
+
     // The current SVG has the actual in width of the court as 360 out of 600 total
     // The height is 780 out of 1080 total
     // This makes the ratio 0.6 for width and 0.7222 for height
@@ -419,19 +420,19 @@ export default function TagMatch() {
               <div>
                 <p>{button.label}</p>
                 <TennisCourtSVG className={styles.courtImage} courtType={button.courtImage} handleImageClick={(event) => {
-                    setPopUp([])
-                    saveToHistory();
-                    let data = matchMetadata;
-                    // add data.x and data.y to the data object
-                    const { x, y } = handleImageClick(event);
-                    data.x = x;
-                    data.y = y;
-                    data.table = tableState.rows;
-                    data.activeRowIndex = tableState.activeRowIndex;
-                    data.videoTimestamp = getVideoTimestamp();
-                    button.action(data);
-                    showPopUp();
-                  }} />
+                  setPopUp([])
+                  saveToHistory();
+                  let data = matchMetadata;
+                  // add data.x and data.y to the data object
+                  const { x, y } = handleImageClick(event);
+                  data.x = x;
+                  data.y = y;
+                  data.table = tableState.rows;
+                  data.activeRowIndex = tableState.activeRowIndex;
+                  data.videoTimestamp = getVideoTimestamp();
+                  button.action(data);
+                  showPopUp();
+                }} />
               </div>
             ) : (
               <button className={styles.customButton} key={index} onClick={() => {
diff --git a/app/components/ExtendedList.js b/app/components/ExtendedList.js
index c68f100..52fae65 100644
--- a/app/components/ExtendedList.js
+++ b/app/components/ExtendedList.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useState} from "react";
+import React, { useEffect, useState } from "react";
 import styles from '../styles/ExtendedList.module.css';
 import getTeams from '@/app/services/getTeams.js';
 import Winner from '../../public/Winner.js';
@@ -7,89 +7,89 @@ import DoubleFault from "../../public/DoubleFault";
 import PlayButton from "../../public/PlayButton";
 
 const ExtendedList = ({ pointsData, clientTeam, opponentTeam, onPointSelect, iframe }) => {
-    const [client_logo, setClientLogo] = useState('');
-    const [opponent_logo, setOpponentLogo] = useState('');
+  const [client_logo, setClientLogo] = useState('');
+  const [opponent_logo, setOpponentLogo] = useState('');
 
-    useEffect(() => {
-      const fetchLogos = async () => {
-        try {
-          const allTeams = await getTeams();
-          const clientLogoURL = allTeams.find((team) => team.name === clientTeam).logoUrl;
-          const opponentLogoURL = allTeams.find((team) => team.name === opponentTeam).logoUrl;
-          setClientLogo(clientLogoURL);
-          setOpponentLogo(opponentLogoURL);
-        } catch (error) {
-          console.error('Error fetching data:', error);
-        }
-      };
-  
-      fetchLogos();
-    });
-    let keys = ["", "serverName", "setScore", "gameScore", "pointScore", "pointWonBy", "lastShotResult", "rallyCount"];
-    let keys_headers = ["Server", "", "Set Score", "Game Score", "Point", "Point Winner", "Last Shot Type", "Shot Count", ""];
+  useEffect(() => {
+    const fetchLogos = async () => {
+      try {
+        const allTeams = await getTeams();
+        const clientLogoURL = allTeams.find((team) => team.name === clientTeam).logoUrl;
+        const opponentLogoURL = allTeams.find((team) => team.name === opponentTeam).logoUrl;
+        setClientLogo(clientLogoURL);
+        setOpponentLogo(opponentLogoURL);
+      } catch (error) {
+        console.error('Error fetching data:', error);
+      }
+    };
 
+    fetchLogos();
+  });
+  let keys = ["", "serverName", "setScore", "gameScore", "pointScore", "pointWonBy", "lastShotResult", "rallyCount"];
+  let keys_headers = ["Server", "", "Set Score", "Game Score", "Point", "Point Winner", "Last Shot Type", "Shot Count", ""];
 
-    const Scroll=(point)=>{
-        // useref
-      onPointSelect(point.Position);
-      if (iframe.current) {
-        iframe.current.scrollIntoView({ behavior: "smooth" });
-    }
+
+  const Scroll = (point) => {
+    // useref
+    onPointSelect(point.Position);
+    if (iframe.current) {
+      iframe.current.scrollIntoView({ behavior: "smooth" });
     }
+  }
+
+  return (
+    <div id="table-container" className={styles.tableContainer}>
+      <table className={styles.table}>
+        <thead>
+          <tr className={styles.TR}>
+            {keys_headers.map((key, index) => (
+              <th className={styles.TH} key={index}>{key}</th>
+            ))}
+          </tr>
+        </thead>
+        <tbody>
+          {pointsData.map((item, rowIndex) => (
+            <tr className={styles.TR} key={rowIndex}>
+              {keys.map((key, cellIndex) => (
+                <td className={styles.TD} key={cellIndex}>
+                  {cellIndex === 0 ? (
+                    <img src={item['player1Name'] === item['serverName'] ? client_logo : opponent_logo} className={styles.IMG} />
+                  ) : (
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                      {cellIndex === keys.length - 2 ? (
+                        <>
+                          {item['lastShotResult'] === 'Winner' && (
+                            <Winner />
+                          )}
+                          {item['lastShotResult'] === 'Error' && (
+                            <Error />
+
+                          )}
+                          {item['lastShotResult'] === 'DoubleFault' && (
+                            <DoubleFault />
 
-    return (
-        <div id="table-container" className={styles.tableContainer}>
-            <table className={styles.table}>
-                <thead>
-                    <tr className={styles.TR}>
-                        {keys_headers.map((key, index) => (
-                            <th className={styles.TH} key={index}>{key}</th>
-                        ))}
-                    </tr>
-                </thead>
-                <tbody>
-                    {pointsData.map((item, rowIndex) => (
-                        <tr className={styles.TR}>
-                            {keys.map((key, cellIndex) => (
-                                <td className={styles.TD} key={cellIndex}>
-                                    {cellIndex === 0 ? (
-                                        <img src={item['player1Name'] === item['serverName'] ? client_logo : opponent_logo} className={styles.IMG}/>
-                                    ) : (
-                                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                                            {cellIndex === keys.length - 2 ? (
-                                                <>
-                                                    {item['lastShotResult'] === 'Winner' && (
-                                                        <Winner/>
-                                                    )}
-                                                    {item['lastShotResult'] === 'Error' && (
-                                                        <Error/>
-                                                        
-                                                    )}
-                                                    {item['lastShotResult'] === 'DoubleFault' && (
-                                                        <DoubleFault/>
-                                                        
-                                                    )}
-                                                    <span style={{ marginLeft: '4px' }}>{item['lastShotResult']}</span>
-                                                </>
-                                            ) : (
-                                                item[key]
-                                            )}
-                                        </div>
-                                    )}
-                                </td>
-                            ))}
+                          )}
+                          <span style={{ marginLeft: '4px' }}>{item['lastShotResult']}</span>
+                        </>
+                      ) : (
+                        item[key]
+                      )}
+                    </div>
+                  )}
+                </td>
+              ))}
 
-                            <td className={styles.TD2}>
-                                <button className={styles.button} onClick={() => Scroll(item)}>
-                                <PlayButton/>
-                                </button>
-                            </td>
-                        </tr>
-                    ))}
-                </tbody>
-            </table>
-        </div>
-    );
+              <td className={styles.TD2}>
+                <button className={styles.button} onClick={() => Scroll(item)}>
+                  <PlayButton />
+                </button>
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
 };
 
 export default ExtendedList;
diff --git a/app/components/PointsList.js b/app/components/PointsList.js
index 2469c1e..228da14 100644
--- a/app/components/PointsList.js
+++ b/app/components/PointsList.js
@@ -3,7 +3,6 @@ import styles from '../styles/PointsList.module.css';
 import getTeams from '@/app/services/getTeams.js';
 
 const PointsList = ({ pointsData, onPointSelect, clientTeam, opponentTeam }) => {
-  const [expanded, setExpanded] = useState(false);
   const [clientLogo, setClientLogo] = useState('');
   const [opponentLogo, setOpponentLogo] = useState('');
 
@@ -66,40 +65,9 @@ const PointsList = ({ pointsData, onPointSelect, clientTeam, opponentTeam }) =>
                 <td><b style={{ fontSize: '1em' }}>{set}</b></td>
                 <td><b style={{ fontSize: '1em' }}>{gameScore}</b></td>
                 <td><b style={{ fontSize: '1em', whiteSpace: 'nowrap', width: '20%' }}>{pointScore}</b></td>
-                <td>
-                  {/* <svg width="2.7vw" height="2.7vw" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <g opacity="0.4">
-                      <mask id="mask0_95_468" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
-                        <rect x="0.191406" y="0.93457" width="24" height="24" fill="#D9D9D9"/>
-                      </mask>
-                      <g mask="url(#mask0_95_468)">
-                        <path d="M9.69043 17.4346L16.6904 12.9346L9.69043 8.43457V17.4346ZM12.1904 22.9346C10.8071 22.9346 9.50709 22.6721 8.29043 22.1471C7.07376 21.6221 6.01543 20.9096 5.11543 20.0096C4.21543 19.1096 3.50293 18.0512 2.97793 16.8346C2.45293 15.6179 2.19043 14.3179 2.19043 12.9346C2.19043 11.5512 2.45293 10.2512 2.97793 9.03457C3.50293 7.8179 4.21543 6.75957 5.11543 5.85957C6.01543 4.95957 7.07376 4.24707 8.29043 3.72207C9.50709 3.19707 10.8071 2.93457 12.1904 2.93457C13.5738 2.93457 14.8738 3.19707 16.0904 3.72207C17.3071 4.24707 18.3654 4.95957 19.2654 5.85957C20.1654 6.75957 20.8779 7.8179 21.4029 9.03457C21.9279 10.2512 22.1904 11.5512 22.1904 12.9346C22.1904 14.3179 21.9279 15.6179 21.4029 16.8346C20.8779 18.0512 20.1654 19.1096 19.2654 20.0096C18.3654 20.9096 17.3071 21.6221 16.0904 22.1471C14.8738 22.6721 13.5738 22.9346 12.1904 22.9346ZM12.1904 20.9346C14.4238 20.9346 16.3154 20.1596 17.8654 18.6096C19.4154 17.0596 20.1904 15.1679 20.1904 12.9346C20.1904 10.7012 19.4154 8.80957 17.8654 7.25957C16.3154 5.70957 14.4238 4.93457 12.1904 4.93457C9.9571 4.93457 8.06543 5.70957 6.51543 7.25957C4.96543 8.80957 4.19043 10.7012 4.19043 12.9346C4.19043 15.1679 4.96543 17.0596 6.51543 18.6096C8.06543 20.1596 9.9571 20.9346 12.1904 20.9346Z" fill="#1C1B1F"/>
-                      </g>
-                    </g>
-                  </svg> */}
-                </td>
               </tr>
             );
           })}
-          
-          {/* {!expanded && pointsData.length > 4 && (
-            <tr>
-              <td colSpan="5" >
-                <div style={{ padding: '0.5vw' }}>
-                  <button className={styles.buttonn} onClick={() => setExpanded(true)}>Expand</button>
-                </div>
-              </td>
-            </tr>
-          )}
-          {expanded && (
-            <tr>
-              <td colSpan="5">
-                <div style={{ padding: '0.5vw' }}>
-                  <button className={styles.buttonn} onClick={() => setExpanded(false)}>Collapse</button>
-                </div>
-              </td>
-            </tr>
-          )} */}
         </tbody>
       </table>
     </div>
diff --git a/app/components/TennisCourtSVG.js b/app/components/TennisCourtSVG.js
index 48322e5..92c1c78 100644
--- a/app/components/TennisCourtSVG.js
+++ b/app/components/TennisCourtSVG.js
@@ -7,64 +7,64 @@ const TennisCourtSVG = ({ handleImageClick, courtType }) => {
       <rect x="0" y="540" width="600" height="540" fill="lightgray" />
       <rect x="0" y="0" width="600" height="540" fill="lightgray" />
 
-        {/* Top half of the court */}
-        <rect x="120" y="150" width="45" height="390" fill="lightblue" />
-        <rect x="165" y="150" width="270" height="180" fill="lightblue" />
-        <rect x="435" y="150" width="45" height="390" fill="lightblue" />
-        <rect x="165" y="330" width="135" height="210" fill="lightblue" />
-        <rect x="300" y="330" width="135" height="210" fill="lightblue" />
-
-        {/* Bottom half of the court, mirrored from the top half */}
-        <rect x="120" y="540" width="45" height="390" fill="lightblue" />
-        <rect x="165" y="750" width="270" height="180" fill="lightblue" />
-        <rect x="435" y="540" width="45" height="390" fill="lightblue" />
-        <rect x="165" y="540" width="135" height="210" fill="lightblue" />
-        <rect x="300" y="540" width="135" height="210" fill="lightblue" />
-
-        {/* Optional service sections top half */}
-        {/* Optional service sections bottom half */}
-        {(courtType === 'serve') && (
-          <>
-            <rect x="165" y="330" width="45" height="210" fill="lightblue" />
-            <rect x="210" y="330" width="45" height="210" fill="lightblue" />
-            <rect x="255" y="330" width="45" height="210" fill="lightblue" />
-            <rect x="300" y="330" width="45" height="210" fill="lightblue" />
-            <rect x="345" y="330" width="45" height="210" fill="lightblue" />
-            <rect x="390" y="330" width="45" height="210" fill="lightblue" />
-
-            <rect x="165" y="540" width="45" height="210" fill="lightblue" />
-            <rect x="210" y="540" width="45" height="210" fill="lightblue" />
-            <rect x="255" y="540" width="45" height="210" fill="lightblue" />
-            <rect x="300" y="540" width="45" height="210" fill="lightblue" />
-            <rect x="345" y="540" width="45" height="210" fill="lightblue" />
-            <rect x="390" y="540" width="45" height="210" fill="lightblue" />
-          </>
-        )}
-
-        {/* T lines and center lines */}
-        <line x1="165" y1="330" x2="435" y2="330" stroke="white" strokeWidth="2" />
-        <line x1="165" y1="750" x2="435" y2="750" stroke="white" strokeWidth="2" />
-        <line x1="300" y1="330" x2="300" y2="540" stroke="white" strokeWidth="2" />
-        <line x1="300" y1="540" x2="300" y2="750" stroke="white" strokeWidth="2" />
-
-        {/* Alley lines */}
-        <line x1="165" y1="150" x2="165" y2="540" stroke="white" strokeWidth="2" />
-        <line x1="435" y1="150" x2="435" y2="540" stroke="white" strokeWidth="2" />
-        <line x1="165" y1="540" x2="165" y2="930" stroke="white" strokeWidth="2" />
-        <line x1="435" y1="540" x2="435" y2="930" stroke="white" strokeWidth="2" />
-
-        {/* Outside alley lines */}
-        <line x1="120" y1="150" x2="120" y2="540" stroke="white" strokeWidth="2" />
-        <line x1="480" y1="150" x2="480" y2="540" stroke="white" strokeWidth="2" />
-        <line x1="120" y1="930" x2="120" y2="540" stroke="white" strokeWidth="2" />
-        <line x1="480" y1="930" x2="480" y2="540" stroke="white" strokeWidth="2" />
-
-        {/* Top and Bottom lines */}
-        <line x1="120" y1="150" x2="480" y2="150" stroke="white" strokeWidth="2" />
-        <line x1="120" y1="930" x2="480" y2="930" stroke="white" strokeWidth="2" />
-
-        {/* Net Line */}
-        <line className="gray-hoverable" x1="90" y1="540" x2="510" y2="540" stroke="black" strokeWidth="4" />
+      {/* Top half of the court */}
+      <rect x="120" y="150" width="45" height="390" fill="lightblue" />
+      <rect x="165" y="150" width="270" height="180" fill="lightblue" />
+      <rect x="435" y="150" width="45" height="390" fill="lightblue" />
+      <rect x="165" y="330" width="135" height="210" fill="lightblue" />
+      <rect x="300" y="330" width="135" height="210" fill="lightblue" />
+
+      {/* Bottom half of the court, mirrored from the top half */}
+      <rect x="120" y="540" width="45" height="390" fill="lightblue" />
+      <rect x="165" y="750" width="270" height="180" fill="lightblue" />
+      <rect x="435" y="540" width="45" height="390" fill="lightblue" />
+      <rect x="165" y="540" width="135" height="210" fill="lightblue" />
+      <rect x="300" y="540" width="135" height="210" fill="lightblue" />
+
+      {/* Optional service sections top half */}
+      {/* Optional service sections bottom half */}
+      {(courtType === 'serve') && (
+        <>
+          <rect x="165" y="330" width="45" height="210" fill="lightblue" />
+          <rect x="210" y="330" width="45" height="210" fill="lightblue" />
+          <rect x="255" y="330" width="45" height="210" fill="lightblue" />
+          <rect x="300" y="330" width="45" height="210" fill="lightblue" />
+          <rect x="345" y="330" width="45" height="210" fill="lightblue" />
+          <rect x="390" y="330" width="45" height="210" fill="lightblue" />
+
+          <rect x="165" y="540" width="45" height="210" fill="lightblue" />
+          <rect x="210" y="540" width="45" height="210" fill="lightblue" />
+          <rect x="255" y="540" width="45" height="210" fill="lightblue" />
+          <rect x="300" y="540" width="45" height="210" fill="lightblue" />
+          <rect x="345" y="540" width="45" height="210" fill="lightblue" />
+          <rect x="390" y="540" width="45" height="210" fill="lightblue" />
+        </>
+      )}
+
+      {/* T lines and center lines */}
+      <line x1="165" y1="330" x2="435" y2="330" stroke="white" strokeWidth="2" />
+      <line x1="165" y1="750" x2="435" y2="750" stroke="white" strokeWidth="2" />
+      <line x1="300" y1="330" x2="300" y2="540" stroke="white" strokeWidth="2" />
+      <line x1="300" y1="540" x2="300" y2="750" stroke="white" strokeWidth="2" />
+
+      {/* Alley lines */}
+      <line x1="165" y1="150" x2="165" y2="540" stroke="white" strokeWidth="2" />
+      <line x1="435" y1="150" x2="435" y2="540" stroke="white" strokeWidth="2" />
+      <line x1="165" y1="540" x2="165" y2="930" stroke="white" strokeWidth="2" />
+      <line x1="435" y1="540" x2="435" y2="930" stroke="white" strokeWidth="2" />
+
+      {/* Outside alley lines */}
+      <line x1="120" y1="150" x2="120" y2="540" stroke="white" strokeWidth="2" />
+      <line x1="480" y1="150" x2="480" y2="540" stroke="white" strokeWidth="2" />
+      <line x1="120" y1="930" x2="120" y2="540" stroke="white" strokeWidth="2" />
+      <line x1="480" y1="930" x2="480" y2="540" stroke="white" strokeWidth="2" />
+
+      {/* Top and Bottom lines */}
+      <line x1="120" y1="150" x2="480" y2="150" stroke="white" strokeWidth="2" />
+      <line x1="120" y1="930" x2="480" y2="930" stroke="white" strokeWidth="2" />
+
+      {/* Net Line */}
+      <line className="gray-hoverable" x1="90" y1="540" x2="510" y2="540" stroke="black" strokeWidth="4" />
 
       <style>
         {`
diff --git a/app/services/taggerButtonData.js b/app/services/taggerButtonData.js
index adba5df..2236455 100644
--- a/app/services/taggerButtonData.js
+++ b/app/services/taggerButtonData.js
@@ -40,203 +40,194 @@ var player1GameScore = 0;
 var player2GameScore = 0;
 
 function updateScore(shotInRally, isWinner, serverName) {
-if ((shotInRally % 2 == 0) &
+  if ((shotInRally % 2 == 0) &
     isWinner == '1') {
-        if (returnerScore == 40) {
-            if (serverName == 'Player1') {
-                    player2GameScore += 1;
-                    serverScore = 0;
-                    returnerScore = 0;
-            }
-            else
-            {
-                player1GameScore += 1;
-                serverScore = 0;
-                returnerScore = 0; 
-            }
+    if (returnerScore == 40) {
+      if (serverName == 'Player1') {
+        player2GameScore += 1;
+        serverScore = 0;
+        returnerScore = 0;
+      }
+      else {
+        player1GameScore += 1;
+        serverScore = 0;
+        returnerScore = 0;
+      }
 
-            }
-            else if (returnerScore != 30) {
-                returnerScore += 15;
-            }
-            else {
-                returnerScore += 10;
-                 }
-}
-else if (shotInRally % 2 == 0) {
-            if (serverScore == 40) {
-                    if (serverName == 'Player1') {
-                        serverScore = 0;
-                        returnerScore = 0;
-                        player1GameScore += 1;
-                    }
-                    else
-                    {
-                        player2GameScore += 1;
-                        serverScore = 0;
-                        returnerScore = 0; 
-                    }
-                }
-            else if (serverScore != 30) {
-                serverScore += 15;
-                            }
-            else    {
-                serverScore += 10;
-                }
-                            
     }
-else if (shotInRally % 2 == 1 &
-isWinner == '1') {
+    else if (returnerScore != 30) {
+      returnerScore += 15;
+    }
+    else {
+      returnerScore += 10;
+    }
+  }
+  else if (shotInRally % 2 == 0) {
     if (serverScore == 40) {
-        if (serverName == 'Player1') {
-            player1GameScore += 1;
-            serverScore = 0;
-            returnerScore = 0;
-        }
-        else
-        {
-            player2GameScore += 1;
-            serverScore = 0;
-            returnerScore = 0; 
-        }
+      if (serverName == 'Player1') {
+        serverScore = 0;
+        returnerScore = 0;
+        player1GameScore += 1;
+      }
+      else {
+        player2GameScore += 1;
+        serverScore = 0;
+        returnerScore = 0;
+      }
     }
     else if (serverScore != 30) {
-    serverScore += 15;
-                }
-    else  {
-    serverScore += 10;
-    }
-}
-else {
-    if (returnerScore == 40) {
-        if (serverName == 'Player1') {
-                serverScore = 0;
-                returnerScore = 0;
-                player2GameScore += 1;
-        }
-        else
-        {
-            player1GameScore += 1;
-            serverScore = 0;
-            returnerScore = 0; 
-        }
-
-        }
-        else if (returnerScore != 30) {
-            returnerScore += 15;
-        }
-        else {
-            returnerScore += 10;
-             }
-}
-}
-function chooseSide() {
-    if (serverScore == 40 || returnerScore == 40) {
-        if ((serverScore + returnerScore) % 2 == 0) {
-            return "Ad";
-        }
-        else
-        {
-            return "Deuce";
-        }
+      serverScore += 15;
     }
     else {
-        if ((serverScore + returnerScore) % 2 == 0) {
-            return "Deuce";
-        }
-        else
-        {
-            return "Ad";
-        } 
+      serverScore += 10;
     }
-    
-}
-function doubleFault(serverName) {
-    if (returnerScore < 30) {
-        returnerScore += 15;
+
+  }
+  else if (shotInRally % 2 == 1 &
+    isWinner == '1') {
+    if (serverScore == 40) {
+      if (serverName == 'Player1') {
+        player1GameScore += 1;
+        serverScore = 0;
+        returnerScore = 0;
+      }
+      else {
+        player2GameScore += 1;
+        serverScore = 0;
+        returnerScore = 0;
+      }
     }
-    else if (returnerScore < 40) {
-        returnerScore += 10;
+    else if (serverScore != 30) {
+      serverScore += 15;
     }
     else {
-    if (serverName == 'Player1') {
-        player2GameScore += 1;
+      serverScore += 10;
+    }
+  }
+  else {
+    if (returnerScore == 40) {
+      if (serverName == 'Player1') {
         serverScore = 0;
         returnerScore = 0;
-    }
-    else
-    {
+        player2GameScore += 1;
+      }
+      else {
         player1GameScore += 1;
         serverScore = 0;
-        returnerScore = 0; 
-    } 
+        returnerScore = 0;
+      }
+
+    }
+    else if (returnerScore != 30) {
+      returnerScore += 15;
+    }
+    else {
+      returnerScore += 10;
     }
+  }
 }
-function ace(serverName) {
-    if (serverScore < 30) {
-        serverScore += 15;
+function chooseSide() {
+  if (serverScore == 40 || returnerScore == 40) {
+    if ((serverScore + returnerScore) % 2 == 0) {
+      return "Ad";
     }
-    else if (serverScore < 40) {
-        serverScore += 10;
+    else {
+      return "Deuce";
+    }
+  }
+  else {
+    if ((serverScore + returnerScore) % 2 == 0) {
+      return "Deuce";
     }
     else {
+      return "Ad";
+    }
+  }
+
+}
+function doubleFault(serverName) {
+  if (returnerScore < 30) {
+    returnerScore += 15;
+  }
+  else if (returnerScore < 40) {
+    returnerScore += 10;
+  }
+  else {
     if (serverName == 'Player1') {
-        player1GameScore += 1;
-        serverScore = 0;
-        returnerScore = 0;
+      player2GameScore += 1;
+      serverScore = 0;
+      returnerScore = 0;
     }
-    else
-    {
-        player2GameScore += 1;
-        serverScore = 0;
-        returnerScore = 0;
+    else {
+      player1GameScore += 1;
+      serverScore = 0;
+      returnerScore = 0;
+    }
+  }
+}
+function ace(serverName) {
+  if (serverScore < 30) {
+    serverScore += 15;
+  }
+  else if (serverScore < 40) {
+    serverScore += 10;
+  }
+  else {
+    if (serverName == 'Player1') {
+      player1GameScore += 1;
+      serverScore = 0;
+      returnerScore = 0;
     }
+    else {
+      player2GameScore += 1;
+      serverScore = 0;
+      returnerScore = 0;
     }
- } 
+  }
+}
 function updateTiebreakScore(shotInRally, isWinner, serverName) {
-    if ((shotInRally % 2 == 0) &
+  if ((shotInRally % 2 == 0) &
     isWinner == '1') {
-        if (serverName == 'Player1') {
-            returnerScore += 1;
-        }
-        else {
-            serverScore += 1;
-        }
+    if (serverName == 'Player1') {
+      returnerScore += 1;
     }
-    else if ((shotInRally % 2 == 0)) {
-        if (serverName == 'Player1') {
-            serverScore += 1;
-        }
-        else {
-            returnerScore += 1;
-        }
+    else {
+      serverScore += 1;
+    }
+  }
+  else if ((shotInRally % 2 == 0)) {
+    if (serverName == 'Player1') {
+      serverScore += 1;
+    }
+    else {
+      returnerScore += 1;
     }
-    else if ((shotInRally % 2 == 1) & 
+  }
+  else if ((shotInRally % 2 == 1) &
     isWinner == '1') {
-        if (serverName == 'Player1') {
-            serverScore += 1;
-        }
-        else {
-            returnerScore += 1;
-        }
+    if (serverName == 'Player1') {
+      serverScore += 1;
     }
-    else  {
-        if (serverName == 'Player1') {
-            returnerScore += 1;
-        }
-        else {
-            serverScore += 1;
-        }
+    else {
+      returnerScore += 1;
     }
+  }
+  else {
+    if (serverName == 'Player1') {
+      returnerScore += 1;
+    }
+    else {
+      serverScore += 1;
+    }
+  }
 }
 function chooseTiebreakSide() {
- if ((serverScore + returnerScore) % 2 == 0) {
-            return "Deuce";
-        }
-else
-        {
-            return "Ad";
-    }
+  if ((serverScore + returnerScore) % 2 == 0) {
+    return "Deuce";
+  }
+  else {
+    return "Ad";
+  }
 
 }
 // function endPoint() {
@@ -256,1829 +247,1720 @@ else
 //     }
 // }
 export const getTaggerButtonData = (updateActiveRow, addNewRow, setCurrentPage) => ({
-    // //added SetScore
-    // 'SetScore': [
-    //     {
-    //         label: '0-0',
-    //         action: () => {
-    //             addNewRow();
-    //             updateLastRow('setScore', '0-0');
-    //             setCurrentPage('GameScore');
-    //         }
-    //     },
-    //     {
-    //         label: '0-1',
-    //         action: () => {
-    //             addNewRow();
-    //             updateLastRow('setScore', '0-1');
-    //             setCurrentPage('GameScore');
-    //         }
-    //     },
-    //     {
-    //         label: '1-0',
-    //         action: () => {
-    //             addNewRow();
-    //             updateLastRow('setScore', '1-0');
-    //             setCurrentPage('GameScore');
-    //         }
-    //     },
-    //     {
-    //         label: '1-1',
-    //         action: () => {
-    //             addNewRow();
-    //             updateLastRow('setScore', '1-1');
-    //             setCurrentPage('GameScore');
-    //         }
-    //     },
-    //     ],
-    // // added GameScore
-    // 'GameScore': [
-    //     {
-    //         label: '0-0',
-    //         action: () => {
-    //             updateLastRow('gameScore', '0-0');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '0-1',
-    //         action: () => {
-    //             updateLastRow('gameScore', '0-1');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '0-2',
-    //         action: () => {
-    //             updateLastRow('gameScore', '0-2');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '0-3',
-    //         action: () => {
-    //             updateLastRow('gameScore', '0-3');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '0-4',
-    //         action: () => {
-    //             updateLastRow('gameScore', '0-4');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '0-5',
-    //         action: () => {
-    //             updateLastRow('gameScore', '0-5');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '1-0',
-    //         action: () => {
-    //             updateLastRow('gameScore', '1-0');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '1-1',
-    //         action: () => {
-    //             updateLastRow('gameScore', '1-1');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '1-2',
-    //         action: () => {
-    //             updateLastRow('gameScore', '1-2');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '1-3',
-    //         action: () => {
-    //             updateLastRow('gameScore', '1-3');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '1-4',
-    //         action: () => {
-    //             updateLastRow('gameScore', '1-4');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '1-5',
-    //         action: () => {
-    //             updateLastRow('gameScore', '1-5');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '2-0',
-    //         action: () => {
-    //             updateLastRow('gameScore', '2-0');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '2-1',
-    //         action: () => {
-    //             updateLastRow('gameScore', '2-1');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '2-2',
-    //         action: () => {
-    //             updateLastRow('gameScore', '2-2');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '2-3',
-    //         action: () => {
-    //             updateLastRow('gameScore', '2-3');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '2-4',
-    //         action: () => {
-    //             updateLastRow('gameScore', '2-4');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '2-5',
-    //         action: () => {
-    //             updateLastRow('gameScore', '2-5');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '3-0',
-    //         action: () => {
-    //             updateLastRow('gameScore', '3-0');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '3-1',
-    //         action: () => {
-    //             updateLastRow('gameScore', '3-1');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '3-2',
-    //         action: () => {
-    //             updateLastRow('gameScore', '3-2');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '3-3',
-    //         action: () => {
-    //             updateLastRow('gameScore', '3-3');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '3-4',
-    //         action: () => {
-    //             updateLastRow('gameScore', '3-4');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '3-5',
-    //         action: () => {
-    //             updateLastRow('gameScore', '3-5');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '4-0',
-    //         action: () => {
-    //             updateLastRow('gameScore', '4-0');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '4-1',
-    //         action: () => {
-    //             updateLastRow('gameScore', '4-1');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '4-2',
-    //         action: () => {
-    //             updateLastRow('gameScore', '4-2');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '4-3',
-    //         action: () => {
-    //             updateLastRow('gameScore', '4-3');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '4-4',
-    //         action: () => {
-    //             updateLastRow('gameScore', '4-4');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '4-5',
-    //         action: () => {
-    //             updateLastRow('gameScore', '4-5');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '5-0',
-    //         action: () => {
-    //             updateLastRow('gameScore', '5-0');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '5-1',
-    //         action: () => {
-    //             updateLastRow('gameScore', '5-1');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '5-2',
-    //         action: () => {
-    //             updateLastRow('gameScore', '5-2');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '5-3',
-    //         action: () => {
-    //             updateLastRow('gameScore', '5-3');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '5-4',
-    //         action: () => {
-    //             updateLastRow('gameScore', '5-4');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '5-5',
-    //         action: () => {
-    //             updateLastRow('gameScore', '5-5');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '5-6',
-    //         action: () => {
-    //             updateLastRow('gameScore', '5-6');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '6-5',
-    //         action: () => {
-    //             updateLastRow('gameScore', '6-5');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-    //     {
-    //         label: '6-6',
-    //         action: () => {
-    //             updateLastRow('gameScore', '6-6');
-    //             setCurrentPage('ServerName');
-    //         }
-    //     },
-        
-    // ],
-    'ServerName': [
-        {
-            label: 'Player1',
-            action: () => {
-                addNewRow();
-                updateActiveRow('serverName', 'Player1');
-                setCurrentPage('ServerSide')
-            }
-        },
-        {
-            label: 'Player2',
-            action: () => {
-                addNewRow();
-                updateActiveRow('serverName', 'Player2');
-                setCurrentPage('ServerSide')
-            }
-        },
-    ],
-    'ServerNameTiebreak': [
-        {
-            label: 'Player1',
-            action: () => {
-                addNewRow();
-                updateActiveRow('serverName', 'Player1');
-                setCurrentPage('ServerSideTiebreak')
-            }
-        },
-        {
-            label: 'Player2',
-            action: () => {
-                addNewRow();
-                updateActiveRow('serverName', 'Player2');
-                setCurrentPage('ServerSideTiebreak')
-            }
-        },
-    ],
-    'ServerSide': [
-        {
-            label: 'NearSide',
-            action: () => {
-                updateActiveRow('serverFarNear', 'Near');
-                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                updateActiveRow('isPointStart', 1);
-                updateActiveRow('shotInRally', 1);
-                updateActiveRow('side', chooseSide());
-                setCurrentPage('FirstServe');
-                //setCurrentPage('PointScore')
-            }
-        },
-        {
-            label: 'FarSide',
-            action: () => {
-                updateActiveRow('serverFarNear', 'Far');
-                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                updateActiveRow('isPointStart', 1);
-                updateActiveRow('shotInRally', 1);
-                updateActiveRow('side', chooseSide());
-                setCurrentPage('FirstServe');
-               // setCurrentPage('PointScore')
-            }
-        },
-    ],
-    'ServerSideTiebreak': [
-        {
-            label: 'NearSide',
-            action: () => {
-                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                updateActiveRow('gameScore', data.table[data.activeRowIndex - 1]['gameScore']);
-                updateActiveRow('setScore', data.table[data.activeRowIndex - 1]['setScore']);
-                updateActiveRow('isPointStart', 1);
-                updateActiveRow('shotInRally', 1);
-                updateActiveRow('side', chooseTiebreakSide());
-                setCurrentPage('FirstServe');
-            }
-        },
-        {
-            label: 'FarSide',
-            action: () => {
-                updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                updateActiveRow('gameScore', data.table[data.activeRowIndex - 1]['gameScore']);
-                updateActiveRow('setScore', data.table[data.activeRowIndex - 1]['setScore']);
-                updateActiveRow('isPointStart', 1);
-                updateActiveRow('shotInRally', 1);
-                updateActiveRow('side', chooseTiebreakSide());
-                setCurrentPage('FirstServe');
-            }
-        },
-    ],
-    'PointScore': [
-        {
-            label: '40-40 (Ad Side)',
-            action: (data) => {
-                updateActiveRow('pointScore', '40-40');
-                updateActiveRow('gameScore', data.table[data.activeRowIndex - 1]['gameScore']);
-                updateActiveRow('setScore', data.table[data.activeRowIndex - 1]['setScore']);
-                updateActiveRow('isPointStart', 1);
-                updateActiveRow('shotInRally', 1);
-                updateActiveRow('side', 'Ad');
-                updateActiveRow('isBreakPoint', 1);
-                setCurrentPage('FirstServe');
-            }
-        },
-        {
-            label: '40-40 (Deuce Side)',
-            action: (data) => {
-                updateActiveRow('pointScore', '40-40');
-                updateActiveRow('gameScore', data.table[data.activeRowIndex - 1]['gameScore']);
-                updateActiveRow('setScore', data.table[data.activeRowIndex - 1]['setScore']);
-                updateActiveRow('isPointStart', 1);
-                updateActiveRow('shotInRally', 1);
-                updateActiveRow('side', 'Deuce');
-                updateActiveRow('isBreakPoint', 1);
-                setCurrentPage('FirstServe');
-            }
-        },
-    ],
-    'FirstServe': [
+  // //added SetScore
+  // 'SetScore': [
+  //     {
+  //         label: '0-0',
+  //         action: () => {
+  //             addNewRow();
+  //             updateLastRow('setScore', '0-0');
+  //             setCurrentPage('GameScore');
+  //         }
+  //     },
+  //     {
+  //         label: '0-1',
+  //         action: () => {
+  //             addNewRow();
+  //             updateLastRow('setScore', '0-1');
+  //             setCurrentPage('GameScore');
+  //         }
+  //     },
+  //     {
+  //         label: '1-0',
+  //         action: () => {
+  //             addNewRow();
+  //             updateLastRow('setScore', '1-0');
+  //             setCurrentPage('GameScore');
+  //         }
+  //     },
+  //     {
+  //         label: '1-1',
+  //         action: () => {
+  //             addNewRow();
+  //             updateLastRow('setScore', '1-1');
+  //             setCurrentPage('GameScore');
+  //         }
+  //     },
+  //     ],
+  // // added GameScore
+  // 'GameScore': [
+  //     {
+  //         label: '0-0',
+  //         action: () => {
+  //             updateLastRow('gameScore', '0-0');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '0-1',
+  //         action: () => {
+  //             updateLastRow('gameScore', '0-1');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '0-2',
+  //         action: () => {
+  //             updateLastRow('gameScore', '0-2');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '0-3',
+  //         action: () => {
+  //             updateLastRow('gameScore', '0-3');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '0-4',
+  //         action: () => {
+  //             updateLastRow('gameScore', '0-4');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '0-5',
+  //         action: () => {
+  //             updateLastRow('gameScore', '0-5');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '1-0',
+  //         action: () => {
+  //             updateLastRow('gameScore', '1-0');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '1-1',
+  //         action: () => {
+  //             updateLastRow('gameScore', '1-1');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '1-2',
+  //         action: () => {
+  //             updateLastRow('gameScore', '1-2');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '1-3',
+  //         action: () => {
+  //             updateLastRow('gameScore', '1-3');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '1-4',
+  //         action: () => {
+  //             updateLastRow('gameScore', '1-4');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '1-5',
+  //         action: () => {
+  //             updateLastRow('gameScore', '1-5');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '2-0',
+  //         action: () => {
+  //             updateLastRow('gameScore', '2-0');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '2-1',
+  //         action: () => {
+  //             updateLastRow('gameScore', '2-1');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '2-2',
+  //         action: () => {
+  //             updateLastRow('gameScore', '2-2');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '2-3',
+  //         action: () => {
+  //             updateLastRow('gameScore', '2-3');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '2-4',
+  //         action: () => {
+  //             updateLastRow('gameScore', '2-4');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '2-5',
+  //         action: () => {
+  //             updateLastRow('gameScore', '2-5');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '3-0',
+  //         action: () => {
+  //             updateLastRow('gameScore', '3-0');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '3-1',
+  //         action: () => {
+  //             updateLastRow('gameScore', '3-1');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '3-2',
+  //         action: () => {
+  //             updateLastRow('gameScore', '3-2');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '3-3',
+  //         action: () => {
+  //             updateLastRow('gameScore', '3-3');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '3-4',
+  //         action: () => {
+  //             updateLastRow('gameScore', '3-4');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '3-5',
+  //         action: () => {
+  //             updateLastRow('gameScore', '3-5');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '4-0',
+  //         action: () => {
+  //             updateLastRow('gameScore', '4-0');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '4-1',
+  //         action: () => {
+  //             updateLastRow('gameScore', '4-1');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '4-2',
+  //         action: () => {
+  //             updateLastRow('gameScore', '4-2');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '4-3',
+  //         action: () => {
+  //             updateLastRow('gameScore', '4-3');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '4-4',
+  //         action: () => {
+  //             updateLastRow('gameScore', '4-4');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '4-5',
+  //         action: () => {
+  //             updateLastRow('gameScore', '4-5');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '5-0',
+  //         action: () => {
+  //             updateLastRow('gameScore', '5-0');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '5-1',
+  //         action: () => {
+  //             updateLastRow('gameScore', '5-1');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '5-2',
+  //         action: () => {
+  //             updateLastRow('gameScore', '5-2');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '5-3',
+  //         action: () => {
+  //             updateLastRow('gameScore', '5-3');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '5-4',
+  //         action: () => {
+  //             updateLastRow('gameScore', '5-4');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '5-5',
+  //         action: () => {
+  //             updateLastRow('gameScore', '5-5');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '5-6',
+  //         action: () => {
+  //             updateLastRow('gameScore', '5-6');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '6-5',
+  //         action: () => {
+  //             updateLastRow('gameScore', '6-5');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+  //     {
+  //         label: '6-6',
+  //         action: () => {
+  //             updateLastRow('gameScore', '6-6');
+  //             setCurrentPage('ServerName');
+  //         }
+  //     },
+
+  // ],
+  'ServerName': [
+    {
+      label: 'Player1',
+      action: () => {
+        addNewRow();
+        updateActiveRow('serverName', 'Player1');
+        setCurrentPage('ServerSide')
+      }
+    },
+    {
+      label: 'Player2',
+      action: () => {
+        addNewRow();
+        updateActiveRow('serverName', 'Player2');
+        setCurrentPage('ServerSide')
+      }
+    },
+  ],
+  'ServerNameTiebreak': [
+    {
+      label: 'Player1',
+      action: () => {
+        addNewRow();
+        updateActiveRow('serverName', 'Player1');
+        setCurrentPage('ServerSideTiebreak')
+      }
+    },
+    {
+      label: 'Player2',
+      action: () => {
+        addNewRow();
+        updateActiveRow('serverName', 'Player2');
+        setCurrentPage('ServerSideTiebreak')
+      }
+    },
+  ],
+  'ServerSide': [
+    {
+      label: 'NearSide',
+      action: () => {
+        updateActiveRow('serverFarNear', 'Near');
+        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+        updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+        updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+        updateActiveRow('isPointStart', 1);
+        updateActiveRow('shotInRally', 1);
+        updateActiveRow('side', chooseSide());
+        setCurrentPage('FirstServe');
+        //setCurrentPage('PointScore')
+      }
+    },
+    {
+      label: 'FarSide',
+      action: () => {
+        updateActiveRow('serverFarNear', 'Far');
+        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+        updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+        updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+        updateActiveRow('isPointStart', 1);
+        updateActiveRow('shotInRally', 1);
+        updateActiveRow('side', chooseSide());
+        setCurrentPage('FirstServe');
+        // setCurrentPage('PointScore')
+      }
+    },
+  ],
+  'ServerSideTiebreak': [
+    {
+      label: 'NearSide',
+      action: (data) => {
+        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+        updateActiveRow('gameScore', data.table[data.activeRowIndex - 1]['gameScore']);
+        updateActiveRow('setScore', data.table[data.activeRowIndex - 1]['setScore']);
+        updateActiveRow('isPointStart', 1);
+        updateActiveRow('shotInRally', 1);
+        updateActiveRow('side', chooseTiebreakSide());
+        setCurrentPage('FirstServe');
+      }
+    },
     {
-    label: 'Ace',
-    action: () => {
+      label: 'FarSide',
+      action: (data) => {
+        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+        updateActiveRow('gameScore', data.table[data.activeRowIndex - 1]['gameScore']);
+        updateActiveRow('setScore', data.table[data.activeRowIndex - 1]['setScore']);
+        updateActiveRow('isPointStart', 1);
+        updateActiveRow('shotInRally', 1);
+        updateActiveRow('side', chooseTiebreakSide());
+        setCurrentPage('FirstServe');
+      }
+    },
+  ],
+  'PointScore': [
+    {
+      label: '40-40 (Ad Side)',
+      action: (data) => {
+        updateActiveRow('pointScore', '40-40');
+        updateActiveRow('gameScore', data.table[data.activeRowIndex - 1]['gameScore']);
+        updateActiveRow('setScore', data.table[data.activeRowIndex - 1]['setScore']);
+        updateActiveRow('isPointStart', 1);
+        updateActiveRow('shotInRally', 1);
+        updateActiveRow('side', 'Ad');
+        updateActiveRow('isBreakPoint', 1);
+        setCurrentPage('FirstServe');
+      }
+    },
+    {
+      label: '40-40 (Deuce Side)',
+      action: (data) => {
+        updateActiveRow('pointScore', '40-40');
+        updateActiveRow('gameScore', data.table[data.activeRowIndex - 1]['gameScore']);
+        updateActiveRow('setScore', data.table[data.activeRowIndex - 1]['setScore']);
+        updateActiveRow('isPointStart', 1);
+        updateActiveRow('shotInRally', 1);
+        updateActiveRow('side', 'Deuce');
+        updateActiveRow('isBreakPoint', 1);
+        setCurrentPage('FirstServe');
+      }
+    },
+  ],
+  'FirstServe': [
+    {
+      label: 'Ace',
+      action: () => {
         updateActiveRow('isAce', '1');
         updateActiveRow('isPointEnd', '1');
         updateActiveRow('isWinner', '1');
         //setCurrentPage('PointScore')
-        }
+      }
     },
     {
-            courtImage: 'serve',
-            label: 'Select First Serve Position',
-            action: (data) => {
-                updateActiveRow('firstServeXCoord', data.x);
-                updateActiveRow('firstServeYCoord', data.y);  
-                // Depending on coordinates, fill location of serve, etc...
-                if (data.table[data.activeRowIndex]['serverFarNear'] == 'Near') {
-                    if ((data.table[data.activeRowIndex])['side'] == 'Deuce') // split by side
-                    {
-                            // Assuming coordinate range of x: 0-(-157), y: 0-245
-                        if (data.x >= -157 & data.x < -101)
-                        {
-                            updateActiveRow('firstServeZone', 'Wide');
-                            if (data.y >= 10 & data.y <= 245)
-                            {
-                                updateActiveRow('firstServeIn', '1');
-                                if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                                    ace(data.table[data.activeRowIndex]['serverName']);
-                                    if (serverScore == 0 && returnerScore == 0) {
-                                        setCurrentPage('ServerName');
-                                    }
-                                    else {
-                                        addNewRow();
-                                    if (serverScore == 40 && returnerScore == 40) {
-                                        setCurrentPage('PointScore');
-                                    }
-                                    else {
-                                        if (data.activeRowIndex > 0)
-                                        {
-                                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                        }
-                                        else {
-                                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                            updateActiveRow('serverName', data.table[0]['serverName']); 
-                                        }
-                                        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                        updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                        updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                        updateActiveRow('isPointStart', 1);
-                                        updateActiveRow('shotInRally', 1);
-                                        updateActiveRow('side', chooseSide());
-                                        setCurrentPage('FirstServe');  
-                                    }   
-                                }
-                            }
-                            else {
-                                setCurrentPage('GroundstrokeContact');
-                            }
-                        }
-                            else
-                            {
-                                updateActiveRow('firstServeIn', '0');
-                                setCurrentPage('SecondServe');
-                            }
-                        }
-                        else if (data.x >= -101 & data.x <= -54)
-                        {
-                            updateActiveRow('firstServeZone', 'Body');
-                            if (data.y >= 10 & data.y <= 245)
-                            {
-                                updateActiveRow('firstServeIn', '1');
-                                if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                                    ace(data.table[data.activeRowIndex]['serverName']);
-                                    if (serverScore == 0 && returnerScore == 0) {
-                                        setCurrentPage('ServerName');
-                                    }
-                                    else {
-                                        addNewRow();
-                                    if (serverScore == 40 && returnerScore == 40) {
-                                        setCurrentPage('PointScore');
-                                    }
-                                    else {
-                                        if (data.activeRowIndex > 0)
-                                        {
-                                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                        }
-                                        else {
-                                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                            updateActiveRow('serverName', data.table[0]['serverName']); 
-                                        }
-                                        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                        updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                        updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                        updateActiveRow('isPointStart', 1);
-                                        updateActiveRow('shotInRally', 1);
-                                        updateActiveRow('side', chooseSide());
-                                        setCurrentPage('FirstServe');  
-                                    }   
-                                }
-                            }
-                            else {
-                                setCurrentPage('GroundstrokeContact');
-                            }
-                            }
-                            else
-                            {
-                                updateActiveRow('firstServeIn', '0');
-                                setCurrentPage('SecondServe');
-                            }
-                        }
-                        else if (data.x > -54 & data.x <= 0)
-                        {
-                            updateActiveRow('firstServeZone', 'T');
-                            if (data.y >= 10 & data.y <= 245)
-                            {
-                                updateActiveRow('firstServeIn', '1');
-                                if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                                    ace(data.table[data.activeRowIndex]['serverName']);
-                                    if (serverScore == 0 && returnerScore == 0) {
-                                        setCurrentPage('ServerName');
-                                    }
-                                    else {
-                                        addNewRow();
-                                    if (serverScore == 40 && returnerScore == 40) {
-                                        setCurrentPage('PointScore');
-                                    }
-                                    else {
-                                        if (data.activeRowIndex > 0)
-                                        {
-                                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                        }
-                                        else {
-                                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                            updateActiveRow('serverName', data.table[0]['serverName']); 
-                                        }
-                                        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                        updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                        updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                        updateActiveRow('isPointStart', 1);
-                                        updateActiveRow('shotInRally', 1);
-                                        updateActiveRow('side', chooseSide());
-                                        setCurrentPage('FirstServe');  
-                                    }   
-                                }
-                            }
-                            else {
-                                setCurrentPage('GroundstrokeContact');
-                            }
-                            }
-                            else
-                            {
-                                updateActiveRow('firstServeIn', '0');
-                                setCurrentPage('SecondServe');
-                            }
-                        }
-                        else
-                        {
-                            updateActiveRow('firstServeIn', '0');
-                            if (data.x > 0) 
-                            {
-                                updateActiveRow('firstServeZone', 'T');
-                            }
-                            else 
-                            {
-                                updateActiveRow('firstServeZone', 'Wide')
-                            }
-                            setCurrentPage('SecondServe');
-                        }
-                    }
-            else // wide and T inverted for Ad side
-                {  // Assuming coordinate range of x: 0-157, y: 0-245
-                    if (data.x >= 0 & data.x < 55)
-                    {
-                        updateActiveRow('firstServeZone', 'T');
-                        if (data.y >= 10 & data.y <= 245)
-                        {
-                            updateActiveRow('firstServeIn', '1');
-                            if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                                ace(data.table[data.activeRowIndex]['serverName']);
-                                if (serverScore == 0 && returnerScore == 0) {
-                                    setCurrentPage('ServerName');
-                                }
-                                else {
-                                    addNewRow();
-                                if (serverScore == 40 && returnerScore == 40) {
-                                    setCurrentPage('PointScore');
-                                }
-                                else {
-                                    if (data.activeRowIndex > 0)
-                                    {
-                                    updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                    updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                    }
-                                    else {
-                                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                        updateActiveRow('serverName', data.table[0]['serverName']); 
-                                    }
-                                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                    updateActiveRow('isPointStart', 1);
-                                    updateActiveRow('shotInRally', 1);
-                                    updateActiveRow('side', chooseSide());
-                                    setCurrentPage('FirstServe');  
-                                }   
-                            }
-                        }
-                        else {
-                            setCurrentPage('GroundstrokeContact');
-                        }
-                        }
-                        else
-                        {
-                            updateActiveRow('firstServeIn', '0');
-                            setCurrentPage('SecondServe');
-                        }
-                    }
-                    else if (data.x >= 55 & data.x <= 105)
-                    {
-                        updateActiveRow('firstServeZone', 'Body');
-                        if (data.y >= 10 & data.y <= 245)
-                        {
-                            updateActiveRow('firstServeIn', '1');
-                            if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                                ace(data.table[data.activeRowIndex]['serverName']);
-                                if (serverScore == 0 && returnerScore == 0) {
-                                    setCurrentPage('ServerName');
-                                }
-                                else {
-                                    addNewRow();
-                                if (serverScore == 40 && returnerScore == 40) {
-                                    setCurrentPage('PointScore');
-                                }
-                                else {
-                                    if (data.activeRowIndex > 0)
-                                    {
-                                    updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                    updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                    }
-                                    else {
-                                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                        updateActiveRow('serverName', data.table[0]['serverName']); 
-                                    }
-                                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                    updateActiveRow('isPointStart', 1);
-                                    updateActiveRow('shotInRally', 1);
-                                    updateActiveRow('side', chooseSide());
-                                    setCurrentPage('FirstServe');  
-                                }   
-                            }
-                        }
-                        else {
-                            setCurrentPage('GroundstrokeContact');
-                        }
-                        }
-                        else
-                        {
-                            updateActiveRow('firstServeIn', '0');
-                            setCurrentPage('SecondServe');
-                        }
+      courtImage: 'serve',
+      label: 'Select First Serve Position',
+      action: (data) => {
+        updateActiveRow('firstServeXCoord', data.x);
+        updateActiveRow('firstServeYCoord', data.y);
+        // Depending on coordinates, fill location of serve, etc...
+        if (data.table[data.activeRowIndex]['serverFarNear'] == 'Near') {
+          if ((data.table[data.activeRowIndex])['side'] == 'Deuce') // split by side
+          {
+            // Assuming coordinate range of x: 0-(-157), y: 0-245
+            if (data.x >= -157 & data.x < -101) {
+              updateActiveRow('firstServeZone', 'Wide');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
+                    if (serverScore == 40 && returnerScore == 40) {
+                      setCurrentPage('PointScore');
                     }
-                    else if (data.x > 105 & data.x <= 157)
-                    {
-                        updateActiveRow('firstServeZone', 'Wide');
-                        if (data.y >= 10 & data.y <= 245)
-                        {
-                            updateActiveRow('firstServeIn', '1');
-                            if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                                ace(data.table[data.activeRowIndex]['serverName']);
-                                if (serverScore == 0 && returnerScore == 0) {
-                                    setCurrentPage('ServerName');
-                                }
-                                else {
-                                    addNewRow();
-                                if (serverScore == 40 && returnerScore == 40) {
-                                    setCurrentPage('PointScore');
-                                }
-                                else {
-                                    updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                    updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                    updateActiveRow('isPointStart', 1);
-                                    updateActiveRow('shotInRally', 1);
-                                    updateActiveRow('side', chooseSide());
-                                    setCurrentPage('FirstServe');  
-                                }   
-                            }
-                        }
-                        else {
-                            setCurrentPage('GroundstrokeContact');
-                        }
-                        }
-                        else
-                        {
-                            updateActiveRow('firstServeIn', '0');
-                            setCurrentPage('SecondServe');
-                        }
+                    else {
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
-                    else
-                    {
-                        updateActiveRow('firstServeIn', '0');
-                        if (data.x < 0) 
-                        {
-                            updateActiveRow('firstServeZone', 'T');
-                        }
-                        else 
-                        {
-                            updateActiveRow('firstServeZone', 'Wide')
-                        }
-                        setCurrentPage('SecondServe');
-                    }   
+                  }
+                }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
-            // FAR SIDE
-            else
-            {
-                if ((data.table[data.activeRowIndex])['side'] == 'Ad') // split by side
-                {
-                // Assuming coordinate range of x: 0-(-157), y: 0-245
-                if (data.x >= -157 & data.x < -105)
-                {
-                    updateActiveRow('firstServeZone', 'Wide');
-                    if (data.y >= 10 & data.y <= 245)
-                    {
-                        updateActiveRow('firstServeIn', '1');
-                        if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                            ace(data.table[data.activeRowIndex]['serverName']);
-                            if (serverScore == 0 && returnerScore == 0) {
-                                setCurrentPage('ServerName');
-                            }
-                            else {
-                                addNewRow();
-                            if (serverScore == 40 && returnerScore == 40) {
-                                setCurrentPage('PointScore');
-                            }
-                            else {
-                                if (data.activeRowIndex > 0)
-                                {
-                                updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                }
-                                else {
-                                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                    updateActiveRow('serverName', data.table[0]['serverName']); 
-                                }
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                            }   
-                        }
+            else if (data.x >= -101 & data.x <= -54) {
+              updateActiveRow('firstServeZone', 'Body');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
+                    if (serverScore == 40 && returnerScore == 40) {
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        setCurrentPage('GroundstrokeContact');
-                    }
-                    }
-                    else
-                    {
-                        updateActiveRow('firstServeIn', '0');
-                        setCurrentPage('SecondServe');
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
+                  }
+                }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
-                else if (data.x >= -105 & data.x <= -52)
-                {
-                    updateActiveRow('firstServeZone', 'Body');
-                    if (data.y >= 10 & data.y <= 245)
-                    {
-                        updateActiveRow('firstServeIn', '1');
-                        if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                            ace(data.table[data.activeRowIndex]['serverName']);
-                            if (serverScore == 0 && returnerScore == 0) {
-                                setCurrentPage('ServerName');
-                            }
-                            else {
-                                addNewRow();
-                            if (serverScore == 40 && returnerScore == 40) {
-                                setCurrentPage('PointScore');
-                            }
-                            else {
-                                if (data.activeRowIndex > 0)
-                                {
-                                updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                }
-                                else {
-                                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                    updateActiveRow('serverName', data.table[0]['serverName']); 
-                                }
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                            }   
-                        }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
+            }
+            else if (data.x > -54 & data.x <= 0) {
+              updateActiveRow('firstServeZone', 'T');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
+                    if (serverScore == 40 && returnerScore == 40) {
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        setCurrentPage('GroundstrokeContact');
-                    }
-                    }
-                    else
-                    {
-                        updateActiveRow('firstServeIn', '0');
-                        setCurrentPage('SecondServe');
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
+                  }
+                }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
-                else if (data.x > -52 & data.x < 0)
-                {
-                    updateActiveRow('firstServeZone', 'T');
-                    if (data.y >= 10 & data.y <= 245)
-                    {
-                        updateActiveRow('firstServeIn', '1');
-                        if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                            ace(data.table[data.activeRowIndex]['serverName']);
-                            if (serverScore == 0 && returnerScore == 0) {
-                                setCurrentPage('ServerName');
-                            }
-                            else {
-                                addNewRow();
-                            if (serverScore == 40 && returnerScore == 40) {
-                                setCurrentPage('PointScore');
-                            }
-                            else {
-                                if (data.activeRowIndex > 0)
-                                {
-                                updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                }
-                                else {
-                                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                    updateActiveRow('serverName', data.table[0]['serverName']); 
-                                }
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                            }   
-                        }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
+            }
+            else {
+              updateActiveRow('firstServeIn', '0');
+              if (data.x > 0) {
+                updateActiveRow('firstServeZone', 'T');
+              }
+              else {
+                updateActiveRow('firstServeZone', 'Wide')
+              }
+              setCurrentPage('SecondServe');
+            }
+          }
+          else // wide and T inverted for Ad side
+          {  // Assuming coordinate range of x: 0-157, y: 0-245
+            if (data.x >= 0 & data.x < 55) {
+              updateActiveRow('firstServeZone', 'T');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
+                    if (serverScore == 40 && returnerScore == 40) {
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        setCurrentPage('GroundstrokeContact');
-                    }
-                    }
-                    else
-                    {
-                        updateActiveRow('firstServeIn', '0');
-                        setCurrentPage('SecondServe');
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
+                  }
                 }
-                else
-                {
-                    updateActiveRow('firstServeIn', '0');
-                    if (data.x > 0) 
-                    {
-                        updateActiveRow('firstServeZone', 'T');
-                    }
-                    else 
-                    {
-                        updateActiveRow('firstServeZone', 'Wide')
-                    }
-                    setCurrentPage('SecondServe');
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
-            else // wide and T inverted for Deuce side
-            {  // Assuming coordinate range of x: 0-157, y: 0-245
-                if (data.x >= 0 & data.x < 50)
-                {
-                    updateActiveRow('firstServeZone', 'T');
-                    if (data.y <= 10 & data.y >= -245)
-                    {
-                        updateActiveRow('firstServeIn', '1');
-                        if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                            ace(data.table[data.activeRowIndex]['serverName']);
-                            if (serverScore == 0 && returnerScore == 0) {
-                                setCurrentPage('ServerName');
-                            }
-                            else {
-                                addNewRow();
-                            if (serverScore == 40 && returnerScore == 40) {
-                                setCurrentPage('PointScore');
-                            }
-                            else {
-                                if (data.activeRowIndex > 0)
-                                {
-                                updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                }
-                                else {
-                                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                    updateActiveRow('serverName', data.table[0]['serverName']); 
-                                }
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                            }   
-                        }
+            else if (data.x >= 55 & data.x <= 105) {
+              updateActiveRow('firstServeZone', 'Body');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
+                    if (serverScore == 40 && returnerScore == 40) {
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        setCurrentPage('GroundstrokeContact');
-                    }
-                    }
-                    else
-                    {
-                        updateActiveRow('firstServeIn', '0');
-                        setCurrentPage('SecondServe');
-                    }
-                }
-                else if (data.x >= 50 & data.x <= 105)
-                {
-                    updateActiveRow('firstServeZone', 'Body');
-                    if (data.y <= 10 & data.y >= -245)
-                    {
-                        updateActiveRow('firstServeIn', '1');
-                        if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                            ace(data.table[data.activeRowIndex]['serverName']);
-                            if (serverScore == 0 && returnerScore == 0) {
-                                setCurrentPage('ServerName');
-                            }
-                            else {
-                                addNewRow();
-                            if (serverScore == 40 && returnerScore == 40) {
-                                setCurrentPage('PointScore');
-                            }
-                            else {
-                                if (data.activeRowIndex > 0)
-                                        {
-                                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                        }
-                                        else {
-                                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                            updateActiveRow('serverName', data.table[0]['serverName']); 
-                                        }
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                            }   
-                        }
-                    }
-                    else {
-                        setCurrentPage('GroundstrokeContact');
-                    }
-                    }
-                    else
-                    {
-                        updateActiveRow('firstServeIn', '0');
-                        setCurrentPage('SecondServe');
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
+                  }
                 }
-                else if (data.x > 105 & data.x <= 157)
-                {
-                    updateActiveRow('firstServeZone', 'Wide');
-                    if (data.y <= 10 & data.y >= -245)
-                    {
-                        updateActiveRow('firstServeIn', '1');
-                        if (data.table[data.activeRowIndex]['isAce'] == '1') {
-                            ace(data.table[data.activeRowIndex]['serverName']);
-                            if (serverScore == 0 && returnerScore == 0) {
-                                setCurrentPage('ServerName');
-                            }
-                            else {
-                                addNewRow();
-                            if (serverScore == 40 && returnerScore == 40) {
-                                setCurrentPage('PointScore');
-                            }
-                            else {
-                                if (data.activeRowIndex > 0)
-                                {
-                                updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                                }
-                                else {
-                                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                    updateActiveRow('serverName', data.table[0]['serverName']); 
-                                }
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                            }   
-                        }
-                    }
-                    else {
-                        setCurrentPage('GroundstrokeContact');
-                    }
-                    }
-                    else
-                    {
-                        updateActiveRow('firstServeIn', '0');
-                        setCurrentPage('SecondServe');
-                    }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
-                else
-                {
-                    updateActiveRow('firstServeIn', '0');
-                    if (data.x <= 0) 
-                    {
-                        updateActiveRow('firstServeZone', 'T');
-                    }
-                    else 
-                    {
-                        updateActiveRow('firstServeZone', 'Wide')
-                    }
-                    setCurrentPage('SecondServe');
-                }   
-            }  
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
-        }
-        },
-    ],
-    'SecondServe': [
-        {
-        courtImage: 'serve',
-        label: 'Select Second Serve Position',
-        action: (data) => {
-            updateActiveRow('secondServeXCoord', data.x);
-            updateActiveRow('secondServeYCoord', data.y);
-            console.log(data.x);
-            console.log(data.y);
-            // Depending on coordinates, fill location of serve, etc...
-            if (data.table[data.activeRowIndex]['serverFarNear'] == 'Near') {
-            if ((data.table[data.activeRowIndex])['side'] == 'Deuce') // split by side
-            {
-            // Assuming coordinate range of x: 0-(-157), y: 0-245
-            if (data.x >= -157 & data.x < -101)
-            {
-                updateActiveRow('secondServeZone', 'Wide');
-                if (data.y >= 10 & data.y <= 245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
-                }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
+            else if (data.x > 105 & data.x <= 157) {
+              updateActiveRow('firstServeZone', 'Wide');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
                     if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe'); 
-                        }
-                        else {
-                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[0]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe'); 
-                        } 
-                    }   
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
                 }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
-            else if (data.x >= -101 & data.x <= -54)
-            {
-                updateActiveRow('secondServeZone', 'Body');
-                if (data.y >= 10 & data.y <= 245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
-                }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
+            else {
+              updateActiveRow('firstServeIn', '0');
+              if (data.x < 0) {
+                updateActiveRow('firstServeZone', 'T');
+              }
+              else {
+                updateActiveRow('firstServeZone', 'Wide')
+              }
+              setCurrentPage('SecondServe');
+            }
+          }
+        }
+        // FAR SIDE
+        else {
+          if ((data.table[data.activeRowIndex])['side'] == 'Ad') // split by side
+          {
+            // Assuming coordinate range of x: 0-(-157), y: 0-245
+            if (data.x >= -157 & data.x < -105) {
+              updateActiveRow('firstServeZone', 'Wide');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
                     if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe'); 
-                        }
-                        else {
-                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[0]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe'); 
-                        } 
-                    }   
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
                 }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
-            else if (data.x > -54 & data.x <= 0)
-            {
-                updateActiveRow('secondServeZone', 'T');
-                if (data.y >= 10 & data.y <= 245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
-                }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
+            else if (data.x >= -105 & data.x <= -52) {
+              updateActiveRow('firstServeZone', 'Body');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
                     if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[0]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');   
-                        }
-                    }   
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
                 }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
-            else
-            {
-                updateActiveRow('secondServeIn', '0');
-                if (data.x > 0) 
-                {
-                    updateActiveRow('secondServeZone', 'T');
-                }
-                else 
-                {
-                    updateActiveRow('secondServeZone', 'Wide')
-                }
-                doubleFault(data.table[data.activeRowIndex]['serverName']);
-                if (serverScore == 0 && returnerScore == 0) {
+            else if (data.x > -52 & data.x < 0) {
+              updateActiveRow('firstServeZone', 'T');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
                     setCurrentPage('ServerName');
-                }
-                else {
+                  }
+                  else {
                     addNewRow();
-                if (serverScore == 40 && returnerScore == 40) {
-                    setCurrentPage('PointScore');
-                }
-                else {
-                    if (data.activeRowIndex > 0) {
-                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                        updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                        updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                        updateActiveRow('isPointStart', 1);
-                        updateActiveRow('shotInRally', 1);
-                        updateActiveRow('side', chooseSide());
-                        setCurrentPage('FirstServe');  
+                    if (serverScore == 40 && returnerScore == 40) {
+                      setCurrentPage('PointScore');
                     }
                     else {
-                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[0]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
-                }   
+                  }
+                }
+                else {
+                  setCurrentPage('GroundstrokeContact');
+                }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
+            else {
+              updateActiveRow('firstServeIn', '0');
+              if (data.x > 0) {
+                updateActiveRow('firstServeZone', 'T');
+              }
+              else {
+                updateActiveRow('firstServeZone', 'Wide')
+              }
+              setCurrentPage('SecondServe');
             }
-        }
-        else // wide and T inverted for Ad side
-        {  // Assuming coordinate range of x: 0-157, y: 0-245
-            if (data.x >= 0 & data.x < 55)
-            {
-                updateActiveRow('secondServeZone', 'T');
-                if (data.y >= 10 & data.y <= 245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
-                }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
+          }
+          else // wide and T inverted for Deuce side
+          {  // Assuming coordinate range of x: 0-157, y: 0-245
+            if (data.x >= 0 & data.x < 50) {
+              updateActiveRow('firstServeZone', 'T');
+              if (data.y <= 10 & data.y >= -245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
                     if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                                updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[0]['serverName']);
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                        } 
-                    }   
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
                 }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
-            else if (data.x >= 55 & data.x <= 105)
-            {
-                updateActiveRow('secondServeZone', 'Body');
-                if (data.y >= 10 & data.y <= 245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
-                }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
+            else if (data.x >= 50 & data.x <= 105) {
+              updateActiveRow('firstServeZone', 'Body');
+              if (data.y <= 10 & data.y >= -245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
                     if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                                updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[0]['serverName']);
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                        }
-                    }   
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
                 }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
-            else if (data.x > 105 & data.x <= 157)
-            {
-                updateActiveRow('secondServeZone', 'Wide');
-                if (data.y >= 10 & data.y <= 245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
-                }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
+            else if (data.x > 105 & data.x <= 157) {
+              updateActiveRow('firstServeZone', 'Wide');
+              if (data.y <= 10 & data.y >= -245) {
+                updateActiveRow('firstServeIn', '1');
+                if (data.table[data.activeRowIndex]['isAce'] == '1') {
+                  ace(data.table[data.activeRowIndex]['serverName']);
+                  if (serverScore == 0 && returnerScore == 0) {
+                    setCurrentPage('ServerName');
+                  }
+                  else {
+                    addNewRow();
                     if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                      setCurrentPage('PointScore');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                                updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[0]['serverName']);
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                        }
-                    }   
+                      if (data.activeRowIndex > 0) {
+                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      }
+                      else {
+                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                        updateActiveRow('serverName', data.table[0]['serverName']);
+                      }
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
                 }
+                else {
+                  setCurrentPage('GroundstrokeContact');
                 }
+              }
+              else {
+                updateActiveRow('firstServeIn', '0');
+                setCurrentPage('SecondServe');
+              }
             }
-            else
-            {
+            else {
+              updateActiveRow('firstServeIn', '0');
+              if (data.x <= 0) {
+                updateActiveRow('firstServeZone', 'T');
+              }
+              else {
+                updateActiveRow('firstServeZone', 'Wide')
+              }
+              setCurrentPage('SecondServe');
+            }
+          }
+        }
+      }
+    },
+  ],
+  'SecondServe': [
+    {
+      courtImage: 'serve',
+      label: 'Select Second Serve Position',
+      action: (data) => {
+        updateActiveRow('secondServeXCoord', data.x);
+        updateActiveRow('secondServeYCoord', data.y);
+        console.log(data.x);
+        console.log(data.y);
+        // Depending on coordinates, fill location of serve, etc...
+        if (data.table[data.activeRowIndex]['serverFarNear'] == 'Near') {
+          if ((data.table[data.activeRowIndex])['side'] == 'Deuce') // split by side
+          {
+            // Assuming coordinate range of x: 0-(-157), y: 0-245
+            if (data.x >= -157 & data.x < -101) {
+              updateActiveRow('secondServeZone', 'Wide');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
                 updateActiveRow('secondServeIn', '0');
-                if (data.x < 0) 
-                {
-                    updateActiveRow('secondServeZone', 'T');
-                }
-                else 
-                {
-                    updateActiveRow('secondServeZone', 'Wide')
-                }
                 doubleFault(data.table[data.activeRowIndex]['serverName']);
                 if (serverScore == 0 && returnerScore == 0) {
-                    setCurrentPage('ServerName');
+                  setCurrentPage('ServerName');
                 }
                 else {
-                    addNewRow();
-                if (serverScore == 40 && returnerScore == 40) {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
                     setCurrentPage('PointScore');
-                }
-                else {
+                  }
+                  else {
                     if (data.activeRowIndex > 0) {
-                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                        updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                        updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                        updateActiveRow('isPointStart', 1);
-                        updateActiveRow('shotInRally', 1);
-                        updateActiveRow('side', chooseSide());
-                        setCurrentPage('FirstServe');  
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[0]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                    }
-                }   
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
             }
-            }   
-        }
-        }
-        // FAR SIDE
-        else
-        {
-            if ((data.table[data.activeRowIndex])['side'] == 'Ad') // split by side
-            {
-                // Assuming coordinate range of x: 75 -215, y: 470-723
-            if (data.x >= -157 & data.x < -105)
-            {
-                updateActiveRow('secondServeZone', 'Wide');
-                if (data.y >= 10 & data.y <= 245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
+            else if (data.x >= -101 & data.x <= -54) {
+              updateActiveRow('secondServeZone', 'Body');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
+                updateActiveRow('secondServeIn', '0');
+                doubleFault(data.table[data.activeRowIndex]['serverName']);
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
                 }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
-                    if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                                updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[0]['serverName']);
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                        } 
-                    }   
-                }
-                }
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
             }
-            else if (data.x >= -105 & data.x <= -52)
-            {
-                updateActiveRow('secondServeZone', 'Body');
-                if (data.y >= 10 & data.y <= 245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
+            else if (data.x > -54 & data.x <= 0) {
+              updateActiveRow('secondServeZone', 'T');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
+                updateActiveRow('secondServeIn', '0');
+                doubleFault(data.table[data.activeRowIndex]['serverName']);
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
                 }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    addNewRow();
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
-                    if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                                updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[0]['serverName']);
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                        }  
-                    }   
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
+            }
+            else {
+              updateActiveRow('secondServeIn', '0');
+              if (data.x > 0) {
+                updateActiveRow('secondServeZone', 'T');
+              }
+              else {
+                updateActiveRow('secondServeZone', 'Wide')
+              }
+              doubleFault(data.table[data.activeRowIndex]['serverName']);
+              if (serverScore == 0 && returnerScore == 0) {
+                setCurrentPage('ServerName');
+              }
+              else {
+                addNewRow();
+                if (serverScore == 40 && returnerScore == 40) {
+                  setCurrentPage('PointScore');
                 }
+                else {
+                  if (data.activeRowIndex > 0) {
+                    updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                    updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                    updateActiveRow('isPointStart', 1);
+                    updateActiveRow('shotInRally', 1);
+                    updateActiveRow('side', chooseSide());
+                    setCurrentPage('FirstServe');
+                  }
+                  else {
+                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                    updateActiveRow('serverName', data.table[0]['serverName']);
+                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                    updateActiveRow('isPointStart', 1);
+                    updateActiveRow('shotInRally', 1);
+                    updateActiveRow('side', chooseSide());
+                    setCurrentPage('FirstServe');
+                  }
                 }
+              }
             }
-            else if (data.x > -52 & data.x < 0)
-            {
-                updateActiveRow('secondServeZone', 'T');
-                if (data.y >= 10 & data.y <= 245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
+          }
+          else // wide and T inverted for Ad side
+          {  // Assuming coordinate range of x: 0-157, y: 0-245
+            if (data.x >= 0 & data.x < 55) {
+              updateActiveRow('secondServeZone', 'T');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
+                updateActiveRow('secondServeIn', '0');
+                doubleFault(data.table[data.activeRowIndex]['serverName']);
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
                 }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
-                    if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                                updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[0]['serverName']);
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                        }
-                    }   
-                }
-                }
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
             }
-            else
-            {
+            else if (data.x >= 55 & data.x <= 105) {
+              updateActiveRow('secondServeZone', 'Body');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
                 updateActiveRow('secondServeIn', '0');
-                if (data.x < 0) 
-                {
-                    updateActiveRow('secondServeZone', 'T');
-                }
-                else 
-                {
-                    updateActiveRow('secondServeZone', 'Wide')
-                }
                 doubleFault(data.table[data.activeRowIndex]['serverName']);
                 if (serverScore == 0 && returnerScore == 0) {
-                    setCurrentPage('ServerName');
+                  setCurrentPage('ServerName');
                 }
                 else {
-                    addNewRow();
-                if (serverScore == 40 && returnerScore == 40) {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
                     setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                    else {
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
+            }
+            else if (data.x > 105 & data.x <= 157) {
+              updateActiveRow('secondServeZone', 'Wide');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
+                updateActiveRow('secondServeIn', '0');
+                doubleFault(data.table[data.activeRowIndex]['serverName']);
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
                 }
                 else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
                     if (data.activeRowIndex > 0) {
-                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                        updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                        updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                        updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                        updateActiveRow('isPointStart', 1);
-                        updateActiveRow('shotInRally', 1);
-                        updateActiveRow('side', chooseSide());
-                        setCurrentPage('FirstServe');  
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                            updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[0]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                    }
-                }   
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
             }
+            else {
+              updateActiveRow('secondServeIn', '0');
+              if (data.x < 0) {
+                updateActiveRow('secondServeZone', 'T');
+              }
+              else {
+                updateActiveRow('secondServeZone', 'Wide')
+              }
+              doubleFault(data.table[data.activeRowIndex]['serverName']);
+              if (serverScore == 0 && returnerScore == 0) {
+                setCurrentPage('ServerName');
+              }
+              else {
+                addNewRow();
+                if (serverScore == 40 && returnerScore == 40) {
+                  setCurrentPage('PointScore');
+                }
+                else {
+                  if (data.activeRowIndex > 0) {
+                    updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                    updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                    updateActiveRow('isPointStart', 1);
+                    updateActiveRow('shotInRally', 1);
+                    updateActiveRow('side', chooseSide());
+                    setCurrentPage('FirstServe');
+                  }
+                  else {
+                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                    updateActiveRow('serverName', data.table[0]['serverName']);
+                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                    updateActiveRow('isPointStart', 1);
+                    updateActiveRow('shotInRally', 1);
+                    updateActiveRow('side', chooseSide());
+                    setCurrentPage('FirstServe');
+                  }
+                }
+              }
             }
+          }
         }
-        else // wide and T inverted for Deuce side
-        {  // Assuming coordinate range of x: 215-350, y: 470-723
-            if (data.x >= 0 & data.x < 50)
-            {
-                updateActiveRow('secondServeZone', 'T');
-                if (data.y <= 10 & data.y >= -245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
+        // FAR SIDE
+        else {
+          if ((data.table[data.activeRowIndex])['side'] == 'Ad') // split by side
+          {
+            // Assuming coordinate range of x: 75 -215, y: 470-723
+            if (data.x >= -157 & data.x < -105) {
+              updateActiveRow('secondServeZone', 'Wide');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
+                updateActiveRow('secondServeIn', '0');
+                doubleFault(data.table[data.activeRowIndex]['serverName']);
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
                 }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
-                    if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                                updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[0]['serverName']);
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                        }  
-                    }   
-                }
-                }
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
             }
-            else if (data.x >= 50 & data.x <= 105)
-            {
-                updateActiveRow('secondServeZone', 'Body');
-                if (data.y <= 10 & data.y >= -245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
+            else if (data.x >= -105 & data.x <= -52) {
+              updateActiveRow('secondServeZone', 'Body');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
+                updateActiveRow('secondServeIn', '0');
+                addNewRow();
+                doubleFault(data.table[data.activeRowIndex]['serverName']);
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
                 }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
+                else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                        addNewRow();
-                    if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
+            }
+            else if (data.x > -52 & data.x < 0) {
+              updateActiveRow('secondServeZone', 'T');
+              if (data.y >= 10 & data.y <= 245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
+                updateActiveRow('secondServeIn', '0');
+                doubleFault(data.table[data.activeRowIndex]['serverName']);
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
+                }
+                else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                                updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[0]['serverName']);
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                        } 
-                    }   
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
+            }
+            else {
+              updateActiveRow('secondServeIn', '0');
+              if (data.x < 0) {
+                updateActiveRow('secondServeZone', 'T');
+              }
+              else {
+                updateActiveRow('secondServeZone', 'Wide')
+              }
+              doubleFault(data.table[data.activeRowIndex]['serverName']);
+              if (serverScore == 0 && returnerScore == 0) {
+                setCurrentPage('ServerName');
+              }
+              else {
+                addNewRow();
+                if (serverScore == 40 && returnerScore == 40) {
+                  setCurrentPage('PointScore');
                 }
+                else {
+                  if (data.activeRowIndex > 0) {
+                    updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                    updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                    updateActiveRow('isPointStart', 1);
+                    updateActiveRow('shotInRally', 1);
+                    updateActiveRow('side', chooseSide());
+                    setCurrentPage('FirstServe');
+                  }
+                  else {
+                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                    updateActiveRow('serverName', data.table[0]['serverName']);
+                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                    updateActiveRow('isPointStart', 1);
+                    updateActiveRow('shotInRally', 1);
+                    updateActiveRow('side', chooseSide());
+                    setCurrentPage('FirstServe');
+                  }
                 }
+              }
             }
-            else if (data.x > 105 & data.x <= 157)
-            {
-                updateActiveRow('secondServeZone', 'Wide');
-                if (data.y <= 10 & data.y >= -245)
-                {
-                    updateActiveRow('secondServeIn', '1');
-                    setCurrentPage('GroundstrokeContact');
+          }
+          else // wide and T inverted for Deuce side
+          {  // Assuming coordinate range of x: 215-350, y: 470-723
+            if (data.x >= 0 & data.x < 50) {
+              updateActiveRow('secondServeZone', 'T');
+              if (data.y <= 10 & data.y >= -245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
+                updateActiveRow('secondServeIn', '0');
+                doubleFault(data.table[data.activeRowIndex]['serverName']);
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
                 }
-                else
-                {
-                    updateActiveRow('secondServeIn', '0');
-                    doubleFault(data.table[data.activeRowIndex]['serverName']);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        setCurrentPage('ServerName');
+                else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                        addNewRow();
-                    if (serverScore == 40 && returnerScore == 40) {
-                        setCurrentPage('PointScore');
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
+            }
+            else if (data.x >= 50 & data.x <= 105) {
+              updateActiveRow('secondServeZone', 'Body');
+              if (data.y <= 10 & data.y >= -245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
+                updateActiveRow('secondServeIn', '0');
+                doubleFault(data.table[data.activeRowIndex]['serverName']);
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
+                }
+                else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
                     }
                     else {
-                        if (data.activeRowIndex > 0) {
-                            updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
-                            updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
-                            updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                            updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                            updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                            updateActiveRow('isPointStart', 1);
-                            updateActiveRow('shotInRally', 1);
-                            updateActiveRow('side', chooseSide());
-                            setCurrentPage('FirstServe');  
-                        }
-                        else {
-                                updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                                updateActiveRow('serverName', data.table[0]['serverName']);
-                                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                                updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                                updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                                updateActiveRow('isPointStart', 1);
-                                updateActiveRow('shotInRally', 1);
-                                updateActiveRow('side', chooseSide());
-                                setCurrentPage('FirstServe');  
-                        }
-                    }   
-                }
-                }
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
             }
-            else
-            {
+            else if (data.x > 105 & data.x <= 157) {
+              updateActiveRow('secondServeZone', 'Wide');
+              if (data.y <= 10 & data.y >= -245) {
+                updateActiveRow('secondServeIn', '1');
+                setCurrentPage('GroundstrokeContact');
+              }
+              else {
                 updateActiveRow('secondServeIn', '0');
-                if (data.x < 0) 
-                {
-                    updateActiveRow('secondServeZone', 'T');
-                }
-                else 
-                {
-                    updateActiveRow('secondServeZone', 'Wide')
-                }
                 doubleFault(data.table[data.activeRowIndex]['serverName']);
-            if (serverScore == 0 && returnerScore == 0) {
-                setCurrentPage('ServerName');
+                if (serverScore == 0 && returnerScore == 0) {
+                  setCurrentPage('ServerName');
+                }
+                else {
+                  addNewRow();
+                  if (serverScore == 40 && returnerScore == 40) {
+                    setCurrentPage('PointScore');
+                  }
+                  else {
+                    if (data.activeRowIndex > 0) {
+                      updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                    else {
+                      updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                      updateActiveRow('serverName', data.table[0]['serverName']);
+                      updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                      updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                      updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                      updateActiveRow('isPointStart', 1);
+                      updateActiveRow('shotInRally', 1);
+                      updateActiveRow('side', chooseSide());
+                      setCurrentPage('FirstServe');
+                    }
+                  }
+                }
+              }
             }
             else {
+              updateActiveRow('secondServeIn', '0');
+              if (data.x < 0) {
+                updateActiveRow('secondServeZone', 'T');
+              }
+              else {
+                updateActiveRow('secondServeZone', 'Wide')
+              }
+              doubleFault(data.table[data.activeRowIndex]['serverName']);
+              if (serverScore == 0 && returnerScore == 0) {
+                setCurrentPage('ServerName');
+              }
+              else {
                 addNewRow();
-            if (serverScore == 40 && returnerScore == 40) {
-                setCurrentPage('PointScore');
-            }
-            else {
-                if (data.activeRowIndex > 0) {
+                if (serverScore == 40 && returnerScore == 40) {
+                  setCurrentPage('PointScore');
+                }
+                else {
+                  if (data.activeRowIndex > 0) {
                     updateActiveRow('serverFarNear', data.table[data.activeRowIndex - 1]['serverFarNear']);
                     updateActiveRow('serverName', data.table[data.activeRowIndex - 1]['serverName']);
                     updateActiveRow('pointScore', serverScore + '-' + returnerScore);
@@ -2087,361 +1969,354 @@ export const getTaggerButtonData = (updateActiveRow, addNewRow, setCurrentPage)
                     updateActiveRow('isPointStart', 1);
                     updateActiveRow('shotInRally', 1);
                     updateActiveRow('side', chooseSide());
-                    setCurrentPage('FirstServe');  
+                    setCurrentPage('FirstServe');
+                  }
+                  else {
+                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+                    updateActiveRow('serverName', data.table[0]['serverName']);
+                    updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                    updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
+                    updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
+                    updateActiveRow('isPointStart', 1);
+                    updateActiveRow('shotInRally', 1);
+                    updateActiveRow('side', chooseSide());
+                    setCurrentPage('FirstServe');
+                  }
                 }
-                else {
-                        updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
-                        updateActiveRow('serverName', data.table[0]['serverName']);
-                        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                        updateActiveRow('gameScore', player1GameScore + '-' + player2GameScore);
-                        updateActiveRow('setScore', player1SetScore + '-' + player2SetScore);
-                        updateActiveRow('isPointStart', 1);
-                        updateActiveRow('shotInRally', 1);
-                        updateActiveRow('side', chooseSide());
-                        setCurrentPage('FirstServe');  
-                } 
-            }   
-        }
-            }   
-        } 
+              }
+            }
+          }
         }
-        
-    }
+
+      }
     }
-    ],
-    'GroundstrokeContact': [
-        {
-            courtImage: true,
-            label: 'Select Shot Contact Position',
-            action: (data) => {
-                addNewRow();
-                updateActiveRow('shotContactX', data.x);
-                updateActiveRow('shotContactY', data.y);
-                if (data.activeRowIndex > 0) {
-                updateActiveRow('shotInRally', parseInt(data.table[data.activeRowIndex]['shotInRally']) + 1);
-                // Need to copy down: pointScore, gameScore, setScore, serverName, serverSide
-                updateActiveRow('serverName', data.table[data.activeRowIndex]['serverName']);
-                updateActiveRow('pointScore', data.table[data.activeRowIndex]['pointScore']);
-                updateActiveRow('gameScore', data.table[data.activeRowIndex]['gameScore']);
-                updateActiveRow('setScore', data.table[data.activeRowIndex]['setScore']);
-                updateActiveRow('tiebreakScore', data.table[data.activeRowIndex]['tiebreakScore']);
-                updateActiveRow('serverFarNear', data.table[data.activeRowIndex]['serverFarNear']);
-                }
-                else {
-                    updateActiveRow('shotInRally', parseInt(data.table[0]['shotInRally']) + 1);
-                    // Need to copy down: pointScore, gameScore, setScore, serverName, serverSide
-                    updateActiveRow('serverName', data.table[0]['serverName']);
-                    updateActiveRow('pointScore', data.table[0]['pointScore']);
-                    updateActiveRow('gameScore', data.table[0]['gameScore']);
-                    updateActiveRow('setScore', data.table[0]['setScore']);
-                    updateActiveRow('tiebreakScore', data.table[0]['tiebreakScore']);
-                    updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);  
-                }
-                if (data.y > 0) 
-                { // assuming 0 is halfway point
-                    if (data.x < 0) 
-                    {
-                        updateActiveRow('side', 'Deuce');
-                        setCurrentPage('GroundstrokeShotInfo')
-                    }
-                    else
-                    {
-                        updateActiveRow('side', 'Ad');
-                        setCurrentPage('GroundstrokeShotInfo')
-                    }
-                }
-                else
-                {
-                    if (data.x < 0) 
-                    {
-                        updateActiveRow('side', 'Ad');
-                        setCurrentPage('GroundstrokeShotInfo')
-                    }
-                    else
-                    {
-                        updateActiveRow('side', 'Deuce');
-                        setCurrentPage('GroundstrokeShotInfo')
-    
-                    } 
-                }
-        },
+  ],
+  'GroundstrokeContact': [
+    {
+      courtImage: true,
+      label: 'Select Shot Contact Position',
+      action: (data) => {
+        addNewRow();
+        updateActiveRow('shotContactX', data.x);
+        updateActiveRow('shotContactY', data.y);
+        if (data.activeRowIndex > 0) {
+          updateActiveRow('shotInRally', parseInt(data.table[data.activeRowIndex]['shotInRally']) + 1);
+          // Need to copy down: pointScore, gameScore, setScore, serverName, serverSide
+          updateActiveRow('serverName', data.table[data.activeRowIndex]['serverName']);
+          updateActiveRow('pointScore', data.table[data.activeRowIndex]['pointScore']);
+          updateActiveRow('gameScore', data.table[data.activeRowIndex]['gameScore']);
+          updateActiveRow('setScore', data.table[data.activeRowIndex]['setScore']);
+          updateActiveRow('tiebreakScore', data.table[data.activeRowIndex]['tiebreakScore']);
+          updateActiveRow('serverFarNear', data.table[data.activeRowIndex]['serverFarNear']);
+        }
+        else {
+          updateActiveRow('shotInRally', parseInt(data.table[0]['shotInRally']) + 1);
+          // Need to copy down: pointScore, gameScore, setScore, serverName, serverSide
+          updateActiveRow('serverName', data.table[0]['serverName']);
+          updateActiveRow('pointScore', data.table[0]['pointScore']);
+          updateActiveRow('gameScore', data.table[0]['gameScore']);
+          updateActiveRow('setScore', data.table[0]['setScore']);
+          updateActiveRow('tiebreakScore', data.table[0]['tiebreakScore']);
+          updateActiveRow('serverFarNear', data.table[0]['serverFarNear']);
+        }
+        if (data.y > 0) { // assuming 0 is halfway point
+          if (data.x < 0) {
+            updateActiveRow('side', 'Deuce');
+            setCurrentPage('GroundstrokeShotInfo')
+          }
+          else {
+            updateActiveRow('side', 'Ad');
+            setCurrentPage('GroundstrokeShotInfo')
+          }
+        }
+        else {
+          if (data.x < 0) {
+            updateActiveRow('side', 'Ad');
+            setCurrentPage('GroundstrokeShotInfo')
+          }
+          else {
+            updateActiveRow('side', 'Deuce');
+            setCurrentPage('GroundstrokeShotInfo')
+
+          }
+        }
+      },
     }
-    ],
-    'GroundstrokeShotInfo': [
-        {
-            label: 'Forehand',
-            action: () => {
-                updateActiveRow('shotFhBh', 'Forehand');
-                setCurrentPage('GroundstrokeLocation');
-            }
-        },
-        {
-            label: 'Backhand',
-            action: () => {
-                updateActiveRow('shotFhBh', 'Backhand');
-                setCurrentPage('GroundstrokeLocation');
-            }
-        },
+  ],
+  'GroundstrokeShotInfo': [
+    {
+      label: 'Forehand',
+      action: () => {
+        updateActiveRow('shotFhBh', 'Forehand');
+        setCurrentPage('GroundstrokeLocation');
+      }
+    },
+    {
+      label: 'Backhand',
+      action: () => {
+        updateActiveRow('shotFhBh', 'Backhand');
+        setCurrentPage('GroundstrokeLocation');
+      }
+    },
 
-    ],
-    'GroundstrokeLocation': [
-        {
-            label: 'Slice',
-            action: () => {
-                updateActiveRow('isSlice', '1');
-            }
-        },
-        {
-            label: 'Dropshot',
-            action: () => {
-                updateActiveRow('isDropshot', '1');
-            }
-        },
-        {
-            label: 'Approach',
-            action: () => {
-                updateActiveRow('isApproach', '1');
-            }
-        },
-        {
-            label: 'Volley',
-            action: () => {
-                updateActiveRow('isVolley', '1');
-            }
-        },
-        {
-            label: 'Overhead',
-            action: () => {
-                updateActiveRow('isOverhead', '1');
+  ],
+  'GroundstrokeLocation': [
+    {
+      label: 'Slice',
+      action: () => {
+        updateActiveRow('isSlice', '1');
+      }
+    },
+    {
+      label: 'Dropshot',
+      action: () => {
+        updateActiveRow('isDropshot', '1');
+      }
+    },
+    {
+      label: 'Approach',
+      action: () => {
+        updateActiveRow('isApproach', '1');
+      }
+    },
+    {
+      label: 'Volley',
+      action: () => {
+        updateActiveRow('isVolley', '1');
+      }
+    },
+    {
+      label: 'Overhead',
+      action: () => {
+        updateActiveRow('isOverhead', '1');
+      }
+    },
+    {
+      label: 'Lob',
+      action: () => {
+        updateActiveRow('isLob', '1');
+      }
+    },
+    {
+      label: 'Player1AtNet',
+      action: () => {
+        updateActiveRow('atNetPlayer1', '1');
+      }
+    },
+    {
+      label: 'Player2AtNet',
+      action: () => {
+        updateActiveRow('atNetPlayer2', '1');
+      }
+    },
+    {
+      label: 'Winner',
+      action: () => {
+        updateActiveRow('isWinner', '1');
+        updateActiveRow('isPointEnd', '1');
+      }
+    },
+    {
+      courtImage: true,
+      label: 'Select Shot Result Location',
+      action: (data) => {
+        updateActiveRow('shotLocationX', data.x);
+        updateActiveRow('shotLocationY', data.y);
+        // assuming 0 is halfway point
+        if (data.x <= 0 & data.table[data.activeRowIndex]["shotContactX"] <= 0) {
+          updateActiveRow('shotDirection', "Down the Line");
+        }
+        else if (data.x <= 0 & data.table[data.activeRowIndex]["shotContactX"] > 0) {
+          updateActiveRow('shotDirection', "Crosscourt");
+        }
+        else if (data.x >= 0 & data.table[data.activeRowIndex]["shotContactX"] < 0) {
+          updateActiveRow('shotDirection', "Crosscourt");
+        }
+        else {
+          updateActiveRow('shotDirection', "Down the Line");
+        }
+        if (data.table[data.activeRowIndex]["shotContactY"] >= 0) {
+          if (data.y >= 0) {
+            updateActiveRow('isErrorNet', '1');
+            updateActiveRow('isPointEnd', '1');
+          }
+          if (data.x > 157) {
+            updateActiveRow('isErrorWideL', '1');
+            updateActiveRow('isPointEnd', '1');
+          }
+          if (data.x < -157) {
+            updateActiveRow('isErrorWideR', '1');
+            updateActiveRow('isPointEnd', '1');
+          }
+          if (data.y < -455) {
+            updateActiveRow('isErrorLong', '1');
+            updateActiveRow('isPointEnd', '1');
+          }
+
+        }
+        else {
+          if (data.y <= 0) {
+            updateActiveRow('isErrorNet', '1');
+            updateActiveRow('isPointEnd', '1');
+          }
+          if (data.x < -157) {
+            updateActiveRow('isErrorWideL', '1');
+            updateActiveRow('isPointEnd', '1');
+          }
+          if (data.x > 157) {
+            updateActiveRow('isErrorWideR', '1');
+            updateActiveRow('isPointEnd', '1');
+          }
+          if (data.y > 455) {
+            updateActiveRow('isErrorLong', '1');
+            updateActiveRow('isPointEnd', '1');
+          }
+        }
+
+        if ((data.table[data.activeRowIndex]["shotContactY"] >= 0 & ((data.y >= 0 || data.y < -455) || (data.x > 157 || data.x < -157))) ||
+          (data.table[data.activeRowIndex]["shotContactY"] < 0 & ((data.y <= 0 || data.y > 455) || (data.x > 157 || data.x < -157)))) {
+          serverScore = parseInt(data.table[data.activeRowIndex]['pointScore'].split("-")[0]);
+          returnerScore = parseInt(data.table[data.activeRowIndex]['pointScore'].split("-")[1]);
+          player1GameScore = parseInt(data.table[data.activeRowIndex]['gameScore'].split("-")[0]);
+          player2GameScore = parseInt(data.table[data.activeRowIndex]['gameScore'].split("-")[1]);
+          player1SetScore = parseInt(data.table[data.activeRowIndex]['setScore'].split("-")[0]);
+          player2SetScore = parseInt(data.table[data.activeRowIndex]['setScore'].split("-")[1]);
+          if (player1GameScore == 6 && player2GameScore == 6) {
+            updateTiebreakScore(parseInt(data.table[data.activeRowIndex]["shotInRally"]),
+              data.table[data.activeRowIndex]["isWinner"],
+              data.table[data.activeRowIndex]["serverName"]);
+            if (serverScore >= 7 && (serverScore - returnerScore) >= 2) {
+              player1SetScore += 1;
+              player1GameScore = 0;
+              player2GameScore = 0;
+              serverScore = 0;
+              returnerScore = 0;
+              setCurrentPage('ServerName');
             }
-        },
-        {
-            label: 'Lob',
-            action: () => {
-                updateActiveRow('isLob', '1');
+            else if (returnerScore >= 7 && (returnerScore - serverScore) >= 2) {
+              player1SetScore += 1;
+              player1GameScore = 0;
+              player2GameScore = 0;
+              returnerScore = 0;
+              serverScore = 0;
+              setCurrentPage('ServerName');
             }
-        },
-        {
-            label: 'Player1AtNet',
-            action: () => {
-                updateActiveRow('atNetPlayer1', '1');
+            else {
+              if ((serverScore + returnerScore) % 2 == 1) { // need to switch scores cuz server switches
+                var tempServeScore = serverScore;
+                serverScore = returnerScore;
+                returnerScore = tempServeScore;
+              }
+              setCurrentPage('ServerName');
             }
-        },
-        {
-            label: 'Player2AtNet',
-            action: () => {
-                updateActiveRow('atNetPlayer2', '1');
+          }
+          else {
+            updateScore(parseInt(data.table[data.activeRowIndex]["shotInRally"]),
+              data.table[data.activeRowIndex]["isWinner"],
+              data.table[data.activeRowIndex]["serverName"]);
+            if (serverScore == 0 && returnerScore == 0) {
+              if (player1GameScore >= 6) {
+                if (player1GameScore - player2GameScore >= 2) {
+                  player1SetScore += 1;
+                  player1GameScore = 0;
+                  player2GameScore = 0;
+                }
+              }
+              else if (player2GameScore >= 6) {
+                if (player2GameScore - player1GameScore >= 2) {
+                  player2SetScore += 1;
+                  player2GameScore = 0;
+                  player1GameScore = 0;
+                }
+              }
+              setCurrentPage('ServerName');
             }
-        },
-        {
-            label: 'Winner',
-            action: () => {
-                updateActiveRow('isWinner', '1');
-                updateActiveRow('isPointEnd', '1');
+            else {
+              addNewRow();
+              if (serverScore == 40 && returnerScore == 40) {
+                updateActiveRow('serverName', data.table[data.activeRowIndex]['serverName'])
+                updateActiveRow('serverFarNear', data.table[data.activeRowIndex]['serverFarNear'])
+                setCurrentPage('PointScore');
+              }
+              else {
+                updateActiveRow('serverFarNear', data.table[data.activeRowIndex]['serverFarNear']);
+                updateActiveRow('serverName', data.table[data.activeRowIndex]['serverName']);
+                updateActiveRow('pointScore', serverScore + '-' + returnerScore);
+                updateActiveRow('gameScore', data.table[data.activeRowIndex]['gameScore']);
+                updateActiveRow('setScore', data.table[data.activeRowIndex]['setScore']);
+                updateActiveRow('isPointStart', 1);
+                updateActiveRow('shotInRally', 1);
+                updateActiveRow('side', chooseSide());
+                setCurrentPage('FirstServe');
+              }
             }
-        },
-        {
-            courtImage: true,
-            label: 'Select Shot Result Location',
-            action: (data) => {
-                updateActiveRow('shotLocationX', data.x);
-                updateActiveRow('shotLocationY', data.y);
-                // assuming 0 is halfway point
-                if (data.x <= 0 & data.table[data.activeRowIndex]["shotContactX"] <= 0) {
-                    updateActiveRow('shotDirection', "Down the Line");
-                }
-                else if (data.x <= 0 & data.table[data.activeRowIndex]["shotContactX"] > 0) {
-                    updateActiveRow('shotDirection', "Crosscourt");
-                }
-                else if (data.x >= 0 & data.table[data.activeRowIndex]["shotContactX"] < 0) {
-                    updateActiveRow('shotDirection', "Crosscourt");
-                }
-                else {
-                    updateActiveRow('shotDirection', "Down the Line");
-                }
-                if (data.table[data.activeRowIndex]["shotContactY"] >= 0) {
-                    if (data.y >= 0) {
-                        updateActiveRow('isErrorNet', '1');
-                        updateActiveRow('isPointEnd', '1');
-                    }
-                    if (data.x > 157) {
-                        updateActiveRow('isErrorWideL', '1');
-                        updateActiveRow('isPointEnd', '1');
-                    }
-                    if (data.x < -157) {
-                        updateActiveRow('isErrorWideR', '1');
-                        updateActiveRow('isPointEnd', '1');
-                    }
-                    if (data.y < -455) {
-                        updateActiveRow('isErrorLong', '1');
-                        updateActiveRow('isPointEnd', '1');
-                    }
+          }
+        }
+        else {
+          setCurrentPage('GroundstrokeContact');
+        }
 
-                }
-                else {
-                    if (data.y <= 0) {
-                        updateActiveRow('isErrorNet', '1');
-                        updateActiveRow('isPointEnd', '1');
-                    }
-                    if (data.x < -157) {
-                        updateActiveRow('isErrorWideL', '1');
-                        updateActiveRow('isPointEnd', '1');
-                    }
-                    if (data.x > 157) {
-                        updateActiveRow('isErrorWideR', '1');
-                        updateActiveRow('isPointEnd', '1');
-                    }
-                    if (data.y > 455) {
-                        updateActiveRow('isErrorLong', '1');
-                        updateActiveRow('isPointEnd', '1');
-                    }
-                }
+      }
 
-                if ((data.table[data.activeRowIndex]["shotContactY"] >= 0 & ((data.y >= 0 || data.y <-455) || (data.x > 157 || data.x < -157))) ||
-                (data.table[data.activeRowIndex]["shotContactY"] < 0 & ((data.y <= 0 || data.y > 455) || (data.x > 157 || data.x < -157)))) {
-                    serverScore =  parseInt(data.table[data.activeRowIndex]['pointScore'].split("-")[0]);
-                    returnerScore =  parseInt(data.table[data.activeRowIndex]['pointScore'].split("-")[1]);
-                    player1GameScore =  parseInt(data.table[data.activeRowIndex]['gameScore'].split("-")[0]);
-                    player2GameScore = parseInt(data.table[data.activeRowIndex]['gameScore'].split("-")[1]); 
-                    player1SetScore =  parseInt(data.table[data.activeRowIndex]['setScore'].split("-")[0]);
-                    player2SetScore = parseInt(data.table[data.activeRowIndex]['setScore'].split("-")[1]);
-                    if (player1GameScore == 6 && player2GameScore == 6) {
-                        updateTiebreakScore(parseInt(data.table[data.activeRowIndex]["shotInRally"]), 
-                        data.table[data.activeRowIndex]["isWinner"], 
-                        data.table[data.activeRowIndex]["serverName"]);
-                        if (serverScore >= 7 && (serverScore - returnerScore) >= 2 ) {
-                            player1SetScore += 1;
-                            player1GameScore = 0;
-                            player2GameScore = 0;
-                            serverScore = 0;
-                            returnerScore = 0;
-                            setCurrentPage('ServerName');
-                        }
-                        else if (returnerScore >= 7 && (returnerScore - serverScore) >= 2 ) {
-                            player1SetScore += 1;
-                            player1GameScore = 0;
-                            player2GameScore = 0;
-                            returnerScore = 0;
-                            serverScore = 0;
-                            setCurrentPage('ServerName');
-                        }
-                        else {
-                            if ((serverScore + returnerScore) % 2 == 1) { // need to switch scores cuz server switches
-                                var tempServeScore = serverScore;
-                                serverScore = returnerScore;
-                                returnerScore = tempServeScore;
-                            }
-                            setCurrentPage('ServerName');
-                        }
-                    }   
-                    else {
-                        updateScore(parseInt(data.table[data.activeRowIndex]["shotInRally"]), 
-                        data.table[data.activeRowIndex]["isWinner"], 
-                        data.table[data.activeRowIndex]["serverName"]);
-                    if (serverScore == 0 && returnerScore == 0) {
-                        if (player1GameScore >= 6) {
-                         if (player1GameScore - player2GameScore >= 2) {
-                            player1SetScore += 1;
-                            player1GameScore = 0;
-                            player2GameScore = 0;
-                         }
-                        }
-                        else if (player2GameScore >= 6) {
-                            if (player2GameScore - player1GameScore >= 2) {
-                               player2SetScore += 1;
-                               player2GameScore = 0;
-                               player1GameScore = 0;
-                            }                
-                        }
-                        setCurrentPage('ServerName');
-                    }
-                    else {
-                        addNewRow();
-                    if (serverScore == 40 && returnerScore == 40) {
-                        updateActiveRow('serverName', data.table[data.activeRowIndex]['serverName'])
-                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex]['serverFarNear'])
-                        setCurrentPage('PointScore');
-                    }
-                    else {
-                        updateActiveRow('serverFarNear', data.table[data.activeRowIndex]['serverFarNear']);
-                        updateActiveRow('serverName', data.table[data.activeRowIndex]['serverName']);
-                        updateActiveRow('pointScore', serverScore + '-' + returnerScore);
-                        updateActiveRow('gameScore', data.table[data.activeRowIndex]['gameScore']);
-                        updateActiveRow('setScore', data.table[data.activeRowIndex]['setScore']);
-                        updateActiveRow('isPointStart', 1);
-                        updateActiveRow('shotInRally', 1);
-                        updateActiveRow('side', chooseSide());
-                        setCurrentPage('FirstServe');  
-                    }   
-                    }
-                }
-            }
-                else 
-                {
-                    setCurrentPage('GroundstrokeContact');
-                }
-            
-        }
-            
-        },
-    ],
+    },
+  ],
 });
 
 export const columnNames = [
-    'pointScore',
-    'gameScore',
-    'setScore',
-    'isPointStart',
-    'pointStartTime',
-    'isPointEnd',
-    'pointEndTime',
-    'pointNumber',
-    'isBreakPoint',
-    'shotInRally',
-    'side',
-    'serverName',
-    'serverFarNear',
-    'firstServeIn',
-    'firstServeZone',
-    'firstServeXCoord',
-    'firstServeYCoord',
-    'secondServeIn',
-    'secondServeZone',
-    'secondServeXCoord',
-    'secondServeYCoord',
-    'isAce',
-    'shotContactX',
-    'shotContactY',
-    'shotDirection',
-    'shotFhBh',
-    'isSlice',
-    'isVolley',
-    'isOverhead',
-    'isApproach',
-    'isDropshot',
-    'atNetPlayer1',
-    'atNetPlayer2',
-    'isLob',
-    'shotLocationX',
-    'shotLocationY',
-    'isWinner',
-    'isErrorWideR',
-    'isErrorWideL',
-    'isErrorNet',
-    'isErrorLong',
-    'clientTeam',
-    'Date',
-    'Division',
-    'Event',
-    'lineupPosition',
-    'matchDetails',
-    'matchVenue',
-    'opponentTeam',
-    'player1Name',
-    'player2Name',
-    'player1Hand',
-    'player2Hand',
-    'Round',
-    'Surface',
-    'Notes',
+  'pointScore',
+  'gameScore',
+  'setScore',
+  'isPointStart',
+  'pointStartTime',
+  'isPointEnd',
+  'pointEndTime',
+  'pointNumber',
+  'isBreakPoint',
+  'shotInRally',
+  'side',
+  'serverName',
+  'serverFarNear',
+  'firstServeIn',
+  'firstServeZone',
+  'firstServeXCoord',
+  'firstServeYCoord',
+  'secondServeIn',
+  'secondServeZone',
+  'secondServeXCoord',
+  'secondServeYCoord',
+  'isAce',
+  'shotContactX',
+  'shotContactY',
+  'shotDirection',
+  'shotFhBh',
+  'isSlice',
+  'isVolley',
+  'isOverhead',
+  'isApproach',
+  'isDropshot',
+  'atNetPlayer1',
+  'atNetPlayer2',
+  'isLob',
+  'shotLocationX',
+  'shotLocationY',
+  'isWinner',
+  'isErrorWideR',
+  'isErrorWideL',
+  'isErrorNet',
+  'isErrorLong',
+  'clientTeam',
+  'Date',
+  'Division',
+  'Event',
+  'lineupPosition',
+  'matchDetails',
+  'matchVenue',
+  'opponentTeam',
+  'player1Name',
+  'player2Name',
+  'player1Hand',
+  'player2Hand',
+  'Round',
+  'Surface',
+  'Notes',
 ];
\ No newline at end of file