diff --git a/content/body/sortable-pagination-table.php b/content/body/sortable-pagination-table.php
index eb092016..1144a272 100644
--- a/content/body/sortable-pagination-table.php
+++ b/content/body/sortable-pagination-table.php
@@ -46,19 +46,15 @@
                     data-descending-label="Sorted in descending order"aria-labelledby="pagination-table-example__caption">
           <thead>
             <tr>
-              <th scope="col"
-              data-sort-type="number">
-                 <button class="sortableColumnLabel" aria-describedby="user-info-table__sort-instructions">Rank</button></th>
               <th scope="col" data-sort-type="default"> <button class="sortableColumnLabel" aria-describedby="user-info-table__sort-instructions">Name</button></th>
-              <th scope="col" data-sort-type="number">  <button class="sortableColumnLabel" aria-describedby="user-info-table__sort-instructions">GDP (IMF '19)</button></th>
-              <th scope="col" data-sort-type="number"> <button class="sortableColumnLabel" aria-describedby="user-info-table__sort-instructions">GDP (UN '16)</button></th>
-              <th scope="col" data-sort-type="default"> <button class="sortableColumnLabel" aria-describedby="user-info-table__sort-instructions">GDP Per Capita</button></th>
+              <th scope="col" data-sort-type="number">  <button class="sortableColumnLabel" aria-describedby="user-info-table__sort-instructions">GDP (Source: IMF 2019)</button></th>
+              <th scope="col" data-sort-type="number"> <button class="sortableColumnLabel" aria-describedby="user-info-table__sort-instructions">GDP (Source: UN 2016)</button></th>
+              <th scope="col" data-sort-type="number"> <button class="sortableColumnLabel" aria-describedby="user-info-table__sort-instructions">GDP Per Capita</button></th>
               <th scope="col" data-sort-type="number"> <button class="sortableColumnLabel" aria-describedby="user-info-table__sort-instructions">Population</button></th>
             </tr>
           </thead>
           <tbody>
             <tr>
-              <td>1</td>
               <td>United States</td>
               <td>22.20 trillion</td>
               <td>18.62 trillion</td>
@@ -66,7 +62,6 @@
               <td>332,915,073</td>
             </tr>
             <tr>
-              <td>2</td>
               <td>China</td>
               <td>15.47 trillion</td>
               <td>11.22 trillion</td>
@@ -74,7 +69,6 @@
               <td>1,444,216,107</td>
             </tr>
             <tr>
-              <td>3</td>
               <td>Japan</td>
               <td>5.50 trillion</td>
               <td>4.94 trillion</td>
@@ -82,7 +76,6 @@
               <td>126,050,804</td>
             </tr>
             <tr>
-              <td>4</td>
               <td>Germany</td>
               <td>4.16 trillion</td>
               <td>3.48 trillion</td>
@@ -90,7 +83,6 @@
               <td>83,900,473</td>
             </tr>
             <tr>
-              <td>5</td>
               <td>India</td>
               <td>3.26 trillion</td>
               <td>2.26 trillion</td>
@@ -98,7 +90,6 @@
               <td>1,393,409,038</td>
             </tr>
             <tr>
-              <td>6</td>
               <td>United Kingdom</td>
               <td>2.93 trillion</td>
               <td>2.65 trillion</td>
@@ -106,7 +97,6 @@
               <td>68,207,116</td>
             </tr>
             <tr>
-              <td>7</td>
               <td>France</td>
               <td>2.88 trillion</td>
               <td>2.47 trillion</td>
@@ -114,7 +104,6 @@
               <td>65,426,179</td>
             </tr>
             <tr>
-              <td>8</td>
               <td>Italy</td>
               <td>2.09 trillion</td>
               <td>1.86 trillion</td>
@@ -122,7 +111,6 @@
               <td>60,367,477</td>
             </tr>
             <tr>
-              <td>9</td>
               <td>Brazil</td>
               <td>2.06 trillion</td>
               <td>1.80 trillion</td>
@@ -130,7 +118,6 @@
               <td>213,993,437</td>
             </tr>
             <tr>
-              <td>10</td>
               <td>Canada</td>
               <td>1.83 trillion</td>
               <td>1.53 trillion</td>
@@ -138,7 +125,6 @@
               <td>38,067,903</td>
             </tr>
             <tr>
-              <td>11</td>
               <td>South Korea</td>
               <td>1.74 trillion</td>
               <td>1.41 trillion</td>
@@ -146,7 +132,6 @@
               <td>51,305,186</td>
             </tr>
             <tr>
-              <td>12</td>
               <td>Russia</td>
               <td>1.67 trillion</td>
               <td>1.25 trillion</td>
@@ -154,7 +139,6 @@
               <td>145,912,025</td>
             </tr>
             <tr>
-              <td>13</td>
               <td>Spain</td>
               <td>1.50 trillion</td>
               <td>1.24 trillion</td>
@@ -162,7 +146,6 @@
               <td>46,745,216</td>
             </tr>
             <tr>
-              <td>14</td>
               <td>Australia</td>
               <td>1.48 trillion</td>
               <td>1.30 trillion</td>
@@ -170,7 +153,6 @@
               <td>25,788,215</td>
             </tr>
             <tr>
-              <td>15</td>
               <td>Mexico</td>
               <td>1.30 trillion</td>
               <td>1.08 trillion</td>
@@ -178,7 +160,6 @@
               <td>130,262,216</td>
             </tr>
             <tr>
-              <td>16</td>
               <td>Indonesia</td>
               <td>1.21 trillion</td>
               <td>932.26 billion</td>
@@ -186,7 +167,6 @@
               <td>276,361,783</td>
             </tr>
             <tr>
-              <td>17</td>
               <td>Netherlands</td>
               <td>954.93 billion</td>
               <td>777.23 billion</td>
@@ -194,7 +174,6 @@
               <td>17,173,099</td>
             </tr>
             <tr>
-              <td>18</td>
               <td>Turkey</td>
               <td>809.55 billion</td>
               <td>863.71 billion</td>
@@ -202,7 +181,6 @@
               <td>85,042,738</td>
             </tr>
             <tr>
-              <td>19</td>
               <td>Saudi Arabia</td>
               <td>790.06 billion</td>
               <td>639.62 billion</td>
@@ -210,7 +188,6 @@
               <td>35,340,683</td>
             </tr>
             <tr>
-              <td>20</td>
               <td>Switzerland</td>
               <td>740.70 billion</td>
               <td>668.85 billion</td>
@@ -218,7 +195,6 @@
               <td>8,715,494</td>
             </tr>
             <tr>
-              <td>21</td>
               <td>Poland</td>
               <td>643.27 billion</td>
               <td>471.40 billion</td>
@@ -226,7 +202,6 @@
               <td>37,797,005</td>
             </tr>
             <tr>
-              <td>22</td>
               <td>Taiwan</td>
               <td>633.70 billion</td>
               <td></td>
@@ -234,7 +209,6 @@
               <td>23,855,010</td>
             </tr>
             <tr>
-              <td>23</td>
               <td>Sweden</td>
               <td>576.72 billion</td>
               <td>514.48 billion</td>
@@ -242,7 +216,6 @@
               <td>10,160,169</td>
             </tr>
             <tr>
-              <td>24</td>
               <td>Belgium</td>
               <td>553.78 billion</td>
               <td>467.96 billion</td>
@@ -250,7 +223,6 @@
               <td>11,632,326</td>
             </tr>
             <tr>
-              <td>25</td>
               <td>Thailand</td>
               <td>547.43 billion</td>
               <td>407.03 billion</td>
@@ -258,7 +230,6 @@
               <td>69,950,850</td>
             </tr>
             <tr>
-              <td>26</td>
               <td>Argentina</td>
               <td>515.35 billion</td>
               <td>545.87 billion</td>
@@ -266,7 +237,6 @@
               <td>45,605,826</td>
             </tr>
             <tr>
-              <td>27</td>
               <td>Nigeria</td>
               <td>496.12 billion</td>
               <td>404.65 billion</td>
@@ -274,7 +244,6 @@
               <td>211,400,708</td>
             </tr>
             <tr>
-              <td>28</td>
               <td>Iran</td>
               <td>495.69 billion</td>
               <td>425.40 billion</td>
@@ -282,7 +251,6 @@
               <td>85,028,759</td>
             </tr>
             <tr>
-              <td>29</td>
               <td>Austria</td>
               <td>481.68 billion</td>
               <td>390.80 billion</td>
@@ -290,7 +258,6 @@
               <td>9,043,070</td>
             </tr>
             <tr>
-              <td>30</td>
               <td>United Arab Emirates</td>
               <td>449.13 billion</td>
               <td>348.74 billion</td>
@@ -298,7 +265,6 @@
               <td>9,991,089</td>
             </tr>
             <tr>
-              <td>31</td>
               <td>Norway</td>
               <td>438.62 billion</td>
               <td>371.07 billion</td>
@@ -306,7 +272,6 @@
               <td>5,465,630</td>
             </tr>
             <tr>
-              <td>32</td>
               <td>Ireland</td>
               <td>405.19 billion</td>
               <td>304.82 billion</td>
@@ -314,7 +279,6 @@
               <td>4,982,907</td>
             </tr>
             <tr>
-              <td>33</td>
               <td>Israel</td>
               <td>403.96 billion</td>
               <td>317.75 billion</td>
@@ -322,7 +286,6 @@
               <td>8,789,774</td>
             </tr>
             <tr>
-              <td>34</td>
               <td>Hong Kong</td>
               <td>402.03 billion</td>
               <td>320.91 billion</td>
@@ -330,7 +293,6 @@
               <td>7,552,810</td>
             </tr>
             <tr>
-              <td>35</td>
               <td>Malaysia</td>
               <td>401.99 billion</td>
               <td>296.53 billion</td>
@@ -338,7 +300,6 @@
               <td>32,776,194</td>
             </tr>
             <tr>
-              <td>36</td>
               <td>Singapore</td>
               <td>391.88 billion</td>
               <td>296.95 billion</td>
@@ -346,7 +307,6 @@
               <td>5,896,686</td>
             </tr>
             <tr>
-              <td>37</td>
               <td>Philippines</td>
               <td>389.05 billion</td>
               <td>304.91 billion</td>
@@ -354,7 +314,6 @@
               <td>111,046,913</td>
             </tr>
             <tr>
-              <td>38</td>
               <td>South Africa</td>
               <td>386.73 billion</td>
               <td>295.44 billion</td>
@@ -362,7 +321,6 @@
               <td>60,041,994</td>
             </tr>
             <tr>
-              <td>39</td>
               <td>Denmark</td>
               <td>364.55 billion</td>
               <td>306.90 billion</td>
@@ -370,7 +328,6 @@
               <td>5,813,298</td>
             </tr>
             <tr>
-              <td>40</td>
               <td>Colombia</td>
               <td>352.81 billion</td>
               <td>282.46 billion</td>
@@ -378,7 +335,6 @@
               <td>51,265,844</td>
             </tr>
             <tr>
-              <td>41</td>
               <td>Bangladesh</td>
               <td>343.28 billion</td>
               <td>220.84 billion</td>
@@ -386,7 +342,6 @@
               <td>166,303,498</td>
             </tr>
             <tr>
-              <td>42</td>
               <td>Egypt</td>
               <td>331.36 billion</td>
               <td>270.14 billion</td>
@@ -394,7 +349,6 @@
               <td>104,258,327</td>
             </tr>
             <tr>
-              <td>43</td>
               <td>Chile</td>
               <td>313.56 billion</td>
               <td>247.05 billion</td>
@@ -402,7 +356,6 @@
               <td>19,212,361</td>
             </tr>
             <tr>
-              <td>44</td>
               <td>Finland</td>
               <td>289.24 billion</td>
               <td>238.50 billion</td>
@@ -410,7 +363,6 @@
               <td>5,548,360</td>
             </tr>
             <tr>
-              <td>45</td>
               <td>Vietnam</td>
               <td>282.37 billion</td>
               <td>205.28 billion</td>
@@ -418,7 +370,6 @@
               <td>98,168,833</td>
             </tr>
             <tr>
-              <td>46</td>
               <td>Romania</td>
               <td>263.13 billion</td>
               <td>186.69 billion</td>
@@ -426,7 +377,6 @@
               <td>19,127,774</td>
             </tr>
             <tr>
-              <td>47</td>
               <td>Czech Republic</td>
               <td>259.74 billion</td>
               <td>195.31 billion</td>
@@ -434,7 +384,6 @@
               <td>10,724,555</td>
             </tr>
             <tr>
-              <td>48</td>
               <td>Portugal</td>
               <td>249.91 billion</td>
               <td>204.84 billion</td>
@@ -442,7 +391,6 @@
               <td>10,167,925</td>
             </tr>
             <tr>
-              <td>49</td>
               <td>Iraq</td>
               <td>246.93 billion</td>
               <td>160.02 billion</td>
@@ -450,7 +398,6 @@
               <td>41,179,350</td>
             </tr>
             <tr>
-              <td>50</td>
               <td>Peru</td>
               <td>244.16 billion</td>
               <td>192.21 billion</td>
@@ -458,7 +405,6 @@
               <td>33,359,418</td>
             </tr>
             <tr>
-              <td>51</td>
               <td>Greece</td>
               <td>230.50 billion</td>
               <td>192.69 billion</td>
@@ -466,7 +412,6 @@
               <td>10,370,744</td>
             </tr>
             <tr>
-              <td>52</td>
               <td>New Zealand</td>
               <td>224.94 billion</td>
               <td>187.52 billion</td>
@@ -474,7 +419,6 @@
               <td>4,860,643</td>
             </tr>
             <tr>
-              <td>53</td>
               <td>Qatar</td>
               <td>204.01 billion</td>
               <td>152.45 billion</td>
@@ -482,7 +426,6 @@
               <td>2,930,528</td>
             </tr>
             <tr>
-              <td>54</td>
               <td>Algeria</td>
               <td>193.06 billion</td>
               <td>159.05 billion</td>
@@ -490,7 +433,6 @@
               <td>44,616,624</td>
             </tr>
             <tr>
-              <td>55</td>
               <td>Hungary</td>
               <td>177.73 billion</td>
               <td>125.82 billion</td>
@@ -498,7 +440,6 @@
               <td>9,634,164</td>
             </tr>
             <tr>
-              <td>56</td>
               <td>Kazakhstan</td>
               <td>177.32 billion</td>
               <td>135.01 billion</td>
@@ -506,7 +447,6 @@
               <td>18,994,962</td>
             </tr>
             <tr>
-              <td>57</td>
               <td>Ukraine</td>
               <td>147.17 billion</td>
               <td>93.27 billion</td>
@@ -514,7 +454,6 @@
               <td>43,466,819</td>
             </tr>
             <tr>
-              <td>58</td>
               <td>Kuwait</td>
               <td>143.00 billion</td>
               <td>110.35 billion</td>
@@ -522,7 +461,6 @@
               <td>4,328,550</td>
             </tr>
             <tr>
-              <td>59</td>
               <td>Morocco</td>
               <td>129.06 billion</td>
               <td>103.61 billion</td>
@@ -530,7 +468,6 @@
               <td>37,344,795</td>
             </tr>
             <tr>
-              <td>60</td>
               <td>Slovakia</td>
               <td>117.40 billion</td>
               <td>89.77 billion</td>
@@ -538,7 +475,6 @@
               <td>5,460,721</td>
             </tr>
             <tr>
-              <td>61</td>
               <td>Kenya</td>
               <td>109.12 billion</td>
               <td>70.53 billion</td>
@@ -546,7 +482,6 @@
               <td>54,985,698</td>
             </tr>
             <tr>
-              <td>62</td>
               <td>Ecuador</td>
               <td>107.73 billion</td>
               <td>98.01 billion</td>
@@ -554,7 +489,6 @@
               <td>17,888,475</td>
             </tr>
             <tr>
-              <td>63</td>
               <td>Puerto Rico</td>
               <td>104.12 billion</td>
               <td>105.03 billion</td>
@@ -562,7 +496,6 @@
               <td>2,828,255</td>
             </tr>
             <tr>
-              <td>64</td>
               <td>Ethiopia</td>
               <td>99.37 billion</td>
               <td>70.31 billion</td>
@@ -570,7 +503,6 @@
               <td>117,876,227</td>
             </tr>
             <tr>
-              <td>65</td>
               <td>Angola</td>
               <td>96.43 billion</td>
               <td>106.92 billion</td>
@@ -578,7 +510,6 @@
               <td>33,933,610</td>
             </tr>
             <tr>
-              <td>66</td>
               <td>Dominican Republic</td>
               <td>90.46 billion</td>
               <td>71.58 billion</td>
@@ -586,7 +517,6 @@
               <td>10,953,703</td>
             </tr>
             <tr>
-              <td>67</td>
               <td>Sri Lanka</td>
               <td>89.94 billion</td>
               <td>81.32 billion</td>
@@ -594,7 +524,6 @@
               <td>21,497,310</td>
             </tr>
             <tr>
-              <td>68</td>
               <td>Guatemala</td>
               <td>87.63 billion</td>
               <td>68.76 billion</td>
@@ -602,7 +531,6 @@
               <td>18,249,860</td>
             </tr>
             <tr>
-              <td>69</td>
               <td>Oman</td>
               <td>84.16 billion</td>
               <td>63.17 billion</td>
@@ -610,7 +538,6 @@
               <td>5,223,375</td>
             </tr>
             <tr>
-              <td>70</td>
               <td>Panama</td>
               <td>75.49 billion</td>
               <td>55.19 billion</td>
@@ -618,7 +545,6 @@
               <td>4,381,579</td>
             </tr>
             <tr>
-              <td>71</td>
               <td>Luxembourg</td>
               <td>73.69 billion</td>
               <td>58.63 billion</td>
@@ -626,7 +552,6 @@
               <td>634,814</td>
             </tr>
             <tr>
-              <td>72</td>
               <td>Ghana</td>
               <td>72.26 billion</td>
               <td>42.79 billion</td>
@@ -634,7 +559,6 @@
               <td>31,732,129</td>
             </tr>
             <tr>
-              <td>73</td>
               <td>Bulgaria</td>
               <td>71.75 billion</td>
               <td>53.24 billion</td>
@@ -642,7 +566,6 @@
               <td>6,896,663</td>
             </tr>
             <tr>
-              <td>74</td>
               <td>Myanmar</td>
               <td>71.40 billion</td>
               <td>65.70 billion</td>
@@ -650,7 +573,6 @@
               <td>54,806,012</td>
             </tr>
             <tr>
-              <td>75</td>
               <td>Venezuela</td>
               <td>70.11 billion</td>
               <td>291.38 billion</td>
@@ -658,7 +580,6 @@
               <td>28,704,954</td>
             </tr>
             <tr>
-              <td>76</td>
               <td>Tanzania</td>
               <td>64.89 billion</td>
               <td></td>
@@ -666,7 +587,6 @@
               <td>61,498,437</td>
             </tr>
             <tr>
-              <td>77</td>
               <td>Croatia</td>
               <td>64.59 billion</td>
               <td>51.23 billion</td>
@@ -674,7 +594,6 @@
               <td>4,081,651</td>
             </tr>
             <tr>
-              <td>78</td>
               <td>Belarus</td>
               <td>63.66 billion</td>
               <td>47.41 billion</td>
@@ -682,7 +601,6 @@
               <td>9,442,862</td>
             </tr>
             <tr>
-              <td>79</td>
               <td>Costa Rica</td>
               <td>63.46 billion</td>
               <td>57.44 billion</td>
@@ -690,7 +608,6 @@
               <td>5,139,052</td>
             </tr>
             <tr>
-              <td>80</td>
               <td>Uruguay</td>
               <td>63.42 billion</td>
               <td>52.42 billion</td>
@@ -698,7 +615,6 @@
               <td>3,485,151</td>
             </tr>
             <tr>
-              <td>81</td>
               <td>Macau</td>
               <td>62.16 billion</td>
               <td>45.31 billion</td>
@@ -706,7 +622,6 @@
               <td>658,394</td>
             </tr>
             <tr>
-              <td>82</td>
               <td>Lebanon</td>
               <td>60.62 billion</td>
               <td>50.46 billion</td>
@@ -714,7 +629,6 @@
               <td>6,769,146</td>
             </tr>
             <tr>
-              <td>83</td>
               <td>Slovenia</td>
               <td>58.21 billion</td>
               <td>44.71 billion</td>
@@ -722,7 +636,6 @@
               <td>2,078,724</td>
             </tr>
             <tr>
-              <td>84</td>
               <td>Lithuania</td>
               <td>57.60 billion</td>
               <td>42.77 billion</td>
@@ -730,7 +643,6 @@
               <td>2,689,862</td>
             </tr>
             <tr>
-              <td>85</td>
               <td>Turkmenistan</td>
               <td>57.06 billion</td>
               <td>36.18 billion</td>
@@ -738,7 +650,6 @@
               <td>6,117,924</td>
             </tr>
             <tr>
-              <td>86</td>
               <td>Serbia</td>
               <td>56.89 billion</td>
               <td>38.30 billion</td>
@@ -746,7 +657,6 @@
               <td>8,697,550</td>
             </tr>
             <tr>
-              <td>87</td>
               <td>Uzbekistan</td>
               <td>55.48 billion</td>
               <td>67.78 billion</td>
@@ -754,7 +664,6 @@
               <td>33,935,763</td>
             </tr>
             <tr>
-              <td>88</td>
               <td>Dr Congo</td>
               <td>52.48 billion</td>
               <td>40.34 billion</td>
@@ -762,7 +671,6 @@
               <td>92,377,993</td>
             </tr>
             <tr>
-              <td>89</td>
               <td>Libya</td>
               <td>50.42 billion</td>
               <td>42.96 billion</td>
@@ -770,7 +678,6 @@
               <td>6,958,532</td>
             </tr>
             <tr>
-              <td>90</td>
               <td>Ivory Coast</td>
               <td>49.88 billion</td>
               <td>36.77 billion</td>
@@ -778,7 +685,6 @@
               <td>27,053,629</td>
             </tr>
             <tr>
-              <td>91</td>
               <td>Azerbaijan</td>
               <td>47.43 billion</td>
               <td>37.85 billion</td>
@@ -786,7 +692,6 @@
               <td>10,223,342</td>
             </tr>
             <tr>
-              <td>92</td>
               <td>Bolivia</td>
               <td>47.05 billion</td>
               <td>33.81 billion</td>
@@ -794,7 +699,6 @@
               <td>11,832,940</td>
             </tr>
             <tr>
-              <td>93</td>
               <td>Jordan</td>
               <td>46.45 billion</td>
               <td>38.65 billion</td>
@@ -802,7 +706,6 @@
               <td>10,269,021</td>
             </tr>
             <tr>
-              <td>94</td>
               <td>Paraguay</td>
               <td>45.38 billion</td>
               <td>27.17 billion</td>
@@ -810,7 +713,6 @@
               <td>7,219,638</td>
             </tr>
             <tr>
-              <td>95</td>
               <td>Cameroon</td>
               <td>42.05 billion</td>
               <td>32.22 billion</td>
@@ -818,7 +720,6 @@
               <td>27,224,265</td>
             </tr>
             <tr>
-              <td>96</td>
               <td>Bahrain</td>
               <td>40.71 billion</td>
               <td>32.18 billion</td>
@@ -826,7 +727,6 @@
               <td>1,748,296</td>
             </tr>
             <tr>
-              <td>97</td>
               <td>Latvia</td>
               <td>38.10 billion</td>
               <td>27.57 billion</td>
@@ -834,7 +734,6 @@
               <td>1,866,942</td>
             </tr>
             <tr>
-              <td>98</td>
               <td>Tunisia</td>
               <td>35.15 billion</td>
               <td>41.70 billion</td>
@@ -842,7 +741,6 @@
               <td>11,935,766</td>
             </tr>
             <tr>
-              <td>99</td>
               <td>Uganda</td>
               <td>33.62 billion</td>
               <td>25.31 billion</td>
@@ -850,7 +748,6 @@
               <td>47,123,531</td>
             </tr>
             <tr>
-              <td>100</td>
               <td>Estonia</td>
               <td>33.23 billion</td>
               <td>23.34 billion</td>
@@ -858,7 +755,6 @@
               <td>1,325,185</td>
             </tr>
             <tr>
-              <td>101</td>
               <td>Nepal</td>
               <td>33.03 billion</td>
               <td>20.91 billion</td>
@@ -866,7 +762,6 @@
               <td>29,674,920</td>
             </tr>
             <tr>
-              <td>102</td>
               <td>Yemen</td>
               <td>31.39 billion</td>
               <td>25.37 billion</td>
@@ -874,7 +769,6 @@
               <td>30,490,640</td>
             </tr>
             <tr>
-              <td>103</td>
               <td>Cambodia</td>
               <td>29.31 billion</td>
               <td>20.02 billion</td>
@@ -882,7 +776,6 @@
               <td>16,946,438</td>
             </tr>
             <tr>
-              <td>104</td>
               <td>El Salvador</td>
               <td>28.20 billion</td>
               <td>26.80 billion</td>
@@ -890,7 +783,6 @@
               <td>6,518,499</td>
             </tr>
             <tr>
-              <td>105</td>
               <td>Senegal</td>
               <td>28.06 billion</td>
               <td>14.60 billion</td>
@@ -898,7 +790,6 @@
               <td>17,196,301</td>
             </tr>
             <tr>
-              <td>106</td>
               <td>Iceland</td>
               <td>26.82 billion</td>
               <td>20.27 billion</td>
@@ -906,7 +797,6 @@
               <td>343,353</td>
             </tr>
             <tr>
-              <td>107</td>
               <td>Cyprus</td>
               <td>26.35 billion</td>
               <td>20.05 billion</td>
@@ -914,7 +804,6 @@
               <td>1,215,584</td>
             </tr>
             <tr>
-              <td>108</td>
               <td>Zimbabwe</td>
               <td>25.81 billion</td>
               <td>16.12 billion</td>
@@ -922,7 +811,6 @@
               <td>15,092,171</td>
             </tr>
             <tr>
-              <td>109</td>
               <td>Honduras</td>
               <td>25.56 billion</td>
               <td>21.52 billion</td>
@@ -930,7 +818,6 @@
               <td>10,062,991</td>
             </tr>
             <tr>
-              <td>110</td>
               <td>Zambia</td>
               <td>25.27 billion</td>
               <td>21.06 billion</td>
@@ -938,7 +825,6 @@
               <td>18,920,651</td>
             </tr>
             <tr>
-              <td>111</td>
               <td>Trinidad And Tobago</td>
               <td>23.23 billion</td>
               <td>24.09 billion</td>
@@ -946,7 +832,6 @@
               <td>1,403,375</td>
             </tr>
             <tr>
-              <td>112</td>
               <td>Papua New Guinea</td>
               <td>22.11 billion</td>
               <td>19.69 billion</td>
@@ -954,7 +839,6 @@
               <td>9,119,010</td>
             </tr>
             <tr>
-              <td>113</td>
               <td>Laos</td>
               <td>22.01 billion</td>
               <td>15.81 billion</td>
@@ -962,7 +846,6 @@
               <td>7,379,358</td>
             </tr>
             <tr>
-              <td>114</td>
               <td>Bosnia And Herzegovina</td>
               <td>21.34 billion</td>
               <td>16.91 billion</td>
@@ -970,7 +853,6 @@
               <td>3,263,466</td>
             </tr>
             <tr>
-              <td>115</td>
               <td>Botswana</td>
               <td>20.87 billion</td>
               <td>15.57 billion</td>
@@ -978,7 +860,6 @@
               <td>2,397,241</td>
             </tr>
             <tr>
-              <td>116</td>
               <td>Afghanistan</td>
               <td>20.68 billion</td>
               <td>20.24 billion</td>
@@ -986,7 +867,6 @@
               <td>39,835,428</td>
             </tr>
             <tr>
-              <td>117</td>
               <td>Mali</td>
               <td>19.33 billion</td>
               <td>14.00 billion</td>
@@ -994,7 +874,6 @@
               <td>20,855,735</td>
             </tr>
             <tr>
-              <td>118</td>
               <td>Georgia</td>
               <td>18.89 billion</td>
               <td>14.33 billion</td>
@@ -1002,7 +881,6 @@
               <td>3,979,765</td>
             </tr>
             <tr>
-              <td>119</td>
               <td>Gabon</td>
               <td>17.89 billion</td>
               <td>13.86 billion</td>
@@ -1010,7 +888,6 @@
               <td>2,278,825</td>
             </tr>
             <tr>
-              <td>120</td>
               <td>Albania</td>
               <td>17.21 billion</td>
               <td>11.86 billion</td>
@@ -1018,7 +895,6 @@
               <td>2,872,933</td>
             </tr>
             <tr>
-              <td>121</td>
               <td>Jamaica</td>
               <td>16.72 billion</td>
               <td>14.06 billion</td>
@@ -1026,7 +902,6 @@
               <td>2,973,463</td>
             </tr>
             <tr>
-              <td>122</td>
               <td>Malta</td>
               <td>16.34 billion</td>
               <td>11.00 billion</td>
@@ -1034,7 +909,6 @@
               <td>442,784</td>
             </tr>
             <tr>
-              <td>123</td>
               <td>Mozambique</td>
               <td>16.29 billion</td>
               <td>10.93 billion</td>
@@ -1042,7 +916,6 @@
               <td>32,163,047</td>
             </tr>
             <tr>
-              <td>124</td>
               <td>Burkina Faso</td>
               <td>16.27 billion</td>
               <td>11.70 billion</td>
@@ -1050,7 +923,6 @@
               <td>21,497,096</td>
             </tr>
             <tr>
-              <td>125</td>
               <td>Mauritius</td>
               <td>15.76 billion</td>
               <td>12.22 billion</td>
@@ -1058,7 +930,6 @@
               <td>1,273,433</td>
             </tr>
             <tr>
-              <td>126</td>
               <td>Mongolia</td>
               <td>14.96 billion</td>
               <td>11.16 billion</td>
@@ -1066,7 +937,6 @@
               <td>3,329,289</td>
             </tr>
             <tr>
-              <td>127</td>
               <td>Namibia</td>
               <td>14.63 billion</td>
               <td>10.95 billion</td>
@@ -1074,7 +944,6 @@
               <td>2,587,344</td>
             </tr>
             <tr>
-              <td>128</td>
               <td>Brunei</td>
               <td>14.28 billion</td>
               <td>11.40 billion</td>
@@ -1082,7 +951,6 @@
               <td>441,532</td>
             </tr>
             <tr>
-              <td>129</td>
               <td>Armenia</td>
               <td>13.87 billion</td>
               <td>10.57 billion</td>
@@ -1090,7 +958,6 @@
               <td>2,968,127</td>
             </tr>
             <tr>
-              <td>130</td>
               <td>Bahamas</td>
               <td>13.71 billion</td>
               <td>11.26 billion</td>
@@ -1098,7 +965,6 @@
               <td>396,913</td>
             </tr>
             <tr>
-              <td>131</td>
               <td>North Macedonia</td>
               <td>13.70 billion</td>
               <td>10.75 billion</td>
@@ -1106,7 +972,6 @@
               <td>2,082,658</td>
             </tr>
             <tr>
-              <td>132</td>
               <td>Guinea</td>
               <td>13.60 billion</td>
               <td>8.48 billion</td>
@@ -1114,7 +979,6 @@
               <td>13,497,244</td>
             </tr>
             <tr>
-              <td>133</td>
               <td>Madagascar</td>
               <td>13.54 billion</td>
               <td>11.22 billion</td>
@@ -1122,7 +986,6 @@
               <td>28,427,328</td>
             </tr>
             <tr>
-              <td>134</td>
               <td>Moldova</td>
               <td>12.79 billion</td>
               <td>6.77 billion</td>
@@ -1130,7 +993,6 @@
               <td>4,024,019</td>
             </tr>
             <tr>
-              <td>135</td>
               <td>Chad</td>
               <td>12.55 billion</td>
               <td>11.27 billion</td>
@@ -1138,7 +1000,6 @@
               <td>16,914,985</td>
             </tr>
             <tr>
-              <td>136</td>
               <td>Nicaragua</td>
               <td>12.46 billion</td>
               <td>13.23 billion</td>
@@ -1146,7 +1007,6 @@
               <td>6,702,385</td>
             </tr>
             <tr>
-              <td>137</td>
               <td>Equatorial Guinea</td>
               <td>12.26 billion</td>
               <td>10.68 billion</td>
@@ -1154,7 +1014,6 @@
               <td>1,449,896</td>
             </tr>
             <tr>
-              <td>138</td>
               <td>Benin</td>
               <td>12.13 billion</td>
               <td>8.89 billion</td>
@@ -1162,7 +1021,6 @@
               <td>12,451,040</td>
             </tr>
             <tr>
-              <td>139</td>
               <td>Republic Of The Congo</td>
               <td>11.37 billion</td>
               <td>7.78 billion</td>
@@ -1170,7 +1028,6 @@
               <td>5,657,013</td>
             </tr>
             <tr>
-              <td>140</td>
               <td>Rwanda</td>
               <td>11.06 billion</td>
               <td>8.47 billion</td>
@@ -1178,7 +1035,6 @@
               <td>13,276,513</td>
             </tr>
             <tr>
-              <td>141</td>
               <td>Niger</td>
               <td>10.63 billion</td>
               <td>7.53 billion</td>
@@ -1186,7 +1042,6 @@
               <td>25,130,817</td>
             </tr>
             <tr>
-              <td>142</td>
               <td>Haiti</td>
               <td>9.65 billion</td>
               <td>7.65 billion</td>
@@ -1194,7 +1049,6 @@
               <td>11,541,685</td>
             </tr>
             <tr>
-              <td>143</td>
               <td>Kyrgyzstan</td>
               <td>8.78 billion</td>
               <td>6.55 billion</td>
@@ -1202,7 +1056,6 @@
               <td>6,628,356</td>
             </tr>
             <tr>
-              <td>144</td>
               <td>Somalia</td>
               <td>8.34 billion</td>
               <td>1.32 billion</td>
@@ -1210,7 +1063,6 @@
               <td>16,359,504</td>
             </tr>
             <tr>
-              <td>145</td>
               <td>Eritrea</td>
               <td>8.12 billion</td>
               <td>5.41 billion</td>
@@ -1218,7 +1070,6 @@
               <td>3,601,467</td>
             </tr>
             <tr>
-              <td>146</td>
               <td>Malawi</td>
               <td>7.86 billion</td>
               <td>5.32 billion</td>
@@ -1226,7 +1077,6 @@
               <td>19,647,684</td>
             </tr>
             <tr>
-              <td>147</td>
               <td>Tajikistan</td>
               <td>7.84 billion</td>
               <td>6.95 billion</td>
@@ -1234,7 +1084,6 @@
               <td>9,749,627</td>
             </tr>
             <tr>
-              <td>148</td>
               <td>Maldives</td>
               <td>6.21 billion</td>
               <td>4.22 billion</td>
@@ -1242,7 +1091,6 @@
               <td>543,617</td>
             </tr>
             <tr>
-              <td>149</td>
               <td>Togo</td>
               <td>6.13 billion</td>
               <td>4.45 billion</td>
@@ -1250,7 +1098,6 @@
               <td>8,478,250</td>
             </tr>
             <tr>
-              <td>150</td>
               <td>Montenegro</td>
               <td>5.74 billion</td>
               <td>4.37 billion</td>
@@ -1258,7 +1105,6 @@
               <td>628,053</td>
             </tr>
             <tr>
-              <td>151</td>
               <td>Mauritania</td>
               <td>5.70 billion</td>
               <td>4.67 billion</td>
@@ -1266,7 +1112,6 @@
               <td>4,775,119</td>
             </tr>
             <tr>
-              <td>152</td>
               <td>Fiji</td>
               <td>5.67 billion</td>
               <td>4.67 billion</td>
@@ -1274,7 +1119,6 @@
               <td>902,906</td>
             </tr>
             <tr>
-              <td>153</td>
               <td>Barbados</td>
               <td>5.34 billion</td>
               <td>4.55 billion</td>
@@ -1282,7 +1126,6 @@
               <td>287,711</td>
             </tr>
             <tr>
-              <td>154</td>
               <td>Eswatini</td>
               <td>4.81 billion</td>
               <td>4.01 billion</td>
@@ -1290,7 +1133,6 @@
               <td>1,172,362</td>
             </tr>
             <tr>
-              <td>155</td>
               <td>Guyana</td>
               <td>4.61 billion</td>
               <td>3.44 billion</td>
@@ -1298,7 +1140,6 @@
               <td>790,326</td>
             </tr>
             <tr>
-              <td>156</td>
               <td>Sierra Leone</td>
               <td>4.22 billion</td>
               <td>3.67 billion</td>
@@ -1306,7 +1147,6 @@
               <td>8,141,343</td>
             </tr>
             <tr>
-              <td>157</td>
               <td>Suriname</td>
               <td>3.92 billion</td>
               <td>3.28 billion</td>
@@ -1314,7 +1154,6 @@
               <td>591,800</td>
             </tr>
             <tr>
-              <td>158</td>
               <td>Burundi</td>
               <td>3.71 billion</td>
               <td>2.87 billion</td>
@@ -1322,7 +1161,6 @@
               <td>12,255,433</td>
             </tr>
             <tr>
-              <td>159</td>
               <td>Timor Leste</td>
               <td>3.41 billion</td>
               <td>2.70 billion</td>
@@ -1330,7 +1168,6 @@
               <td>1,343,873</td>
             </tr>
             <tr>
-              <td>160</td>
               <td>Liberia</td>
               <td>3.22 billion</td>
               <td>2.76 billion</td>
@@ -1338,7 +1175,6 @@
               <td>5,180,203</td>
             </tr>
             <tr>
-              <td>161</td>
               <td>Aruba</td>
               <td>2.95 billion</td>
               <td>2.67 billion</td>
@@ -1346,7 +1182,6 @@
               <td>107,204</td>
             </tr>
             <tr>
-              <td>162</td>
               <td>Bhutan</td>
               <td>2.94 billion</td>
               <td>2.21 billion</td>
@@ -1354,7 +1189,6 @@
               <td>779,898</td>
             </tr>
             <tr>
-              <td>163</td>
               <td>Lesotho</td>
               <td>2.89 billion</td>
               <td>2.24 billion</td>
@@ -1362,7 +1196,6 @@
               <td>2,159,079</td>
             </tr>
             <tr>
-              <td>164</td>
               <td>South Sudan</td>
               <td>2.80 billion</td>
               <td>6.53 billion</td>
@@ -1370,7 +1203,6 @@
               <td>11,381,378</td>
             </tr>
             <tr>
-              <td>165</td>
               <td>Djibouti</td>
               <td>2.60 billion</td>
               <td>1.89 billion</td>
@@ -1378,7 +1210,6 @@
               <td>1,002,187</td>
             </tr>
             <tr>
-              <td>166</td>
               <td>Central African Republic</td>
               <td>2.48 billion</td>
               <td>1.81 billion</td>
@@ -1386,7 +1217,6 @@
               <td>4,919,981</td>
             </tr>
             <tr>
-              <td>167</td>
               <td>Cape Verde</td>
               <td>2.21 billion</td>
               <td>1.64 billion</td>
@@ -1394,7 +1224,6 @@
               <td>561,898</td>
             </tr>
             <tr>
-              <td>168</td>
               <td>Belize</td>
               <td>2.07 billion</td>
               <td>1.74 billion</td>
@@ -1402,7 +1231,6 @@
               <td>404,914</td>
             </tr>
             <tr>
-              <td>169</td>
               <td>Saint Lucia</td>
               <td>2.07 billion</td>
               <td>1.40 billion</td>
@@ -1410,7 +1238,6 @@
               <td>184,400</td>
             </tr>
             <tr>
-              <td>170</td>
               <td>Gambia</td>
               <td>1.87 billion</td>
               <td>985.83 million</td>
@@ -1418,7 +1245,6 @@
               <td>2,486,945</td>
             </tr>
             <tr>
-              <td>171</td>
               <td>Antigua And Barbuda</td>
               <td>1.81 billion</td>
               <td>1.46 billion</td>
@@ -1426,7 +1252,6 @@
               <td>98,731</td>
             </tr>
             <tr>
-              <td>172</td>
               <td>Seychelles</td>
               <td>1.74 billion</td>
               <td>1.43 billion</td>
@@ -1434,7 +1259,6 @@
               <td>98,908</td>
             </tr>
             <tr>
-              <td>173</td>
               <td>San Marino</td>
               <td>1.67 billion</td>
               <td>1.59 billion</td>
@@ -1442,7 +1266,6 @@
               <td>34,017</td>
             </tr>
             <tr>
-              <td>174</td>
               <td>Guinea Bissau</td>
               <td>1.67 billion</td>
               <td>1.12 billion</td>
@@ -1450,7 +1273,6 @@
               <td>2,015,494</td>
             </tr>
             <tr>
-              <td>175</td>
               <td>Solomon Islands</td>
               <td>1.61 billion</td>
               <td>1.13 billion</td>
@@ -1458,7 +1280,6 @@
               <td>703,996</td>
             </tr>
             <tr>
-              <td>176</td>
               <td>Grenada</td>
               <td>1.33 billion</td>
               <td>1.02 billion</td>
@@ -1466,7 +1287,6 @@
               <td>113,021</td>
             </tr>
             <tr>
-              <td>177</td>
               <td>Saint Kitts And Nevis</td>
               <td>1.12 billion</td>
               <td>909.85 million</td>
@@ -1474,7 +1294,6 @@
               <td>53,544</td>
             </tr>
             <tr>
-              <td>178</td>
               <td>Vanuatu</td>
               <td>994.00 million</td>
               <td>837.52 million</td>
@@ -1482,7 +1301,6 @@
               <td>314,464</td>
             </tr>
             <tr>
-              <td>179</td>
               <td>Samoa</td>
               <td>960.00 million</td>
               <td>822.23 million</td>
@@ -1490,7 +1308,6 @@
               <td>200,149</td>
             </tr>
             <tr>
-              <td>180</td>
               <td>Saint Vincent And The Grenadines</td>
               <td>903.00 million</td>
               <td>765.32 million</td>
@@ -1498,7 +1315,6 @@
               <td>111,263</td>
             </tr>
             <tr>
-              <td>181</td>
               <td>Comoros</td>
               <td>773.00 million</td>
               <td>1.15 billion</td>
@@ -1506,7 +1322,6 @@
               <td>888,451</td>
             </tr>
             <tr>
-              <td>182</td>
               <td>Dominica</td>
               <td>590.00 million</td>
               <td>581.48 million</td>
@@ -1514,7 +1329,6 @@
               <td>72,167</td>
             </tr>
             <tr>
-              <td>183</td>
               <td>Sao Tome And Principe</td>
               <td>527.00 million</td>
               <td>342.78 million</td>
@@ -1522,7 +1336,6 @@
               <td>223,368</td>
             </tr>
             <tr>
-              <td>184</td>
               <td>Tonga</td>
               <td>512.00 million</td>
               <td>401.46 million</td>
@@ -1530,7 +1343,6 @@
               <td>106,760</td>
             </tr>
             <tr>
-              <td>185</td>
               <td>Micronesia</td>
               <td>389.00 million</td>
               <td>329.90 million</td>
@@ -1538,7 +1350,6 @@
               <td>116,254</td>
             </tr>
             <tr>
-              <td>186</td>
               <td>Palau</td>
               <td>324.00 million</td>
               <td>310.25 million</td>
@@ -1546,7 +1357,6 @@
               <td>18,169</td>
             </tr>
             <tr>
-              <td>187</td>
               <td>Marshall Islands</td>
               <td>228.00 million</td>
               <td>183.00 million</td>
@@ -1554,7 +1364,6 @@
               <td>59,610</td>
             </tr>
             <tr>
-              <td>188</td>
               <td>Kiribati</td>
               <td>196.00 million</td>
               <td>173.66 million</td>
@@ -1562,7 +1371,6 @@
               <td>121,392</td>
             </tr>
             <tr>
-              <td>189</td>
               <td>Nauru</td>
               <td>117.00 million</td>
               <td>103.47 million</td>
@@ -1570,7 +1378,6 @@
               <td>10,876</td>
             </tr>
             <tr>
-              <td>190</td>
               <td>Tuvalu</td>
               <td>53.00 million</td>
               <td>36.70 million</td>
@@ -1578,7 +1385,6 @@
               <td>11,931</td>
             </tr>
             <tr>
-              <td>191</td>
               <td>Andorra</td>
               <td></td>
               <td>2.86 billion</td>
@@ -1586,7 +1392,6 @@
               <td>77,355</td>
             </tr>
             <tr>
-              <td>192</td>
               <td>Bermuda</td>
               <td></td>
               <td>6.13 billion</td>
@@ -1594,7 +1399,6 @@
               <td>62,090</td>
             </tr>
             <tr>
-              <td>193</td>
               <td>British Virgin Islands</td>
               <td></td>
               <td>971.24 million</td>
@@ -1602,7 +1406,6 @@
               <td>30,421</td>
             </tr>
             <tr>
-              <td>194</td>
               <td>Cayman Islands</td>
               <td></td>
               <td>3.84 billion</td>
@@ -1610,7 +1413,6 @@
               <td>66,497</td>
             </tr>
             <tr>
-              <td>195</td>
               <td>Cook Islands</td>
               <td></td>
               <td>290.19 million</td>
@@ -1618,7 +1420,6 @@
               <td>17,565</td>
             </tr>
             <tr>
-              <td>196</td>
               <td>Cuba</td>
               <td></td>
               <td>89.69 billion</td>
@@ -1626,7 +1427,6 @@
               <td>11,317,505</td>
             </tr>
             <tr>
-              <td>197</td>
               <td>French Polynesia</td>
               <td></td>
               <td>5.42 billion</td>
@@ -1634,7 +1434,6 @@
               <td>282,530</td>
             </tr>
             <tr>
-              <td>198</td>
               <td>Palestine</td>
               <td></td>
               <td>13.40 billion</td>
@@ -1642,7 +1441,6 @@
               <td>5,222,748</td>
             </tr>
             <tr>
-              <td>199</td>
               <td>Greenland</td>
               <td></td>
               <td>2.28 billion</td>
@@ -1650,7 +1448,6 @@
               <td>56,877</td>
             </tr>
             <tr>
-              <td>200</td>
               <td>North Korea</td>
               <td></td>
               <td>16.79 billion</td>
@@ -1658,7 +1455,6 @@
               <td>25,887,041</td>
             </tr>
             <tr>
-              <td>201</td>
               <td>Liechtenstein</td>
               <td></td>
               <td>6.19 billion</td>
@@ -1666,7 +1462,6 @@
               <td>38,250</td>
             </tr>
             <tr>
-              <td>202</td>
               <td>Monaco</td>
               <td></td>
               <td>6.47 billion</td>
@@ -1674,7 +1469,6 @@
               <td>39,511</td>
             </tr>
             <tr>
-              <td>203</td>
               <td>Montserrat</td>
               <td></td>
               <td>62.05 million</td>
@@ -1682,7 +1476,6 @@
               <td>4,977</td>
             </tr>
             <tr>
-              <td>204</td>
               <td>Curacao</td>
               <td></td>
               <td>3.12 billion</td>
@@ -1690,7 +1483,6 @@
               <td>164,798</td>
             </tr>
             <tr>
-              <td>205</td>
               <td>Sint Maarten</td>
               <td></td>
               <td>1.07 billion</td>
@@ -1698,7 +1490,6 @@
               <td>43,412</td>
             </tr>
             <tr>
-              <td>206</td>
               <td>New Caledonia</td>
               <td></td>
               <td>9.45 billion</td>
@@ -1706,7 +1497,6 @@
               <td>288,218</td>
             </tr>
             <tr>
-              <td>207</td>
               <td>Pakistan</td>
               <td></td>
               <td>282.51 billion</td>
@@ -1714,7 +1504,6 @@
               <td>225,199,937</td>
             </tr>
             <tr>
-              <td>208</td>
               <td>Anguilla</td>
               <td></td>
               <td>337.52 million</td>
@@ -1722,7 +1511,6 @@
               <td>15,117</td>
             </tr>
             <tr>
-              <td>209</td>
               <td>Sudan</td>
               <td></td>
               <td>82.89 billion</td>
@@ -1730,7 +1518,6 @@
               <td>44,909,353</td>
             </tr>
             <tr>
-              <td>210</td>
               <td>Syria</td>
               <td></td>
               <td>22.16 billion</td>
@@ -1738,7 +1525,6 @@
               <td>18,275,702</td>
             </tr>
             <tr>
-              <td>211</td>
               <td>Turks And Caicos Islands</td>
               <td></td>
               <td>917.55 million</td>
diff --git a/css/sortable-tables.css b/css/sortable-tables.css
index bc855ba7..59f0d384 100644
--- a/css/sortable-tables.css
+++ b/css/sortable-tables.css
@@ -15,9 +15,11 @@
   border-collapse: collapse;
   border-spacing: 0;
   overflow: visible;
-  margin-top: 8px;
   width: 100%;
 }
+.deque-table-sortable__group table.deque-table-sortable {
+  margin-top: 8px;
+}
 .deque-table-sortable__group table thead {
   border-bottom: 1px solid #e3e3e3;
 }
@@ -30,6 +32,7 @@
 .deque-table-sortable__group table thead th .sortableColumnLabel {
   display: inline-block;
   height: 100%;
+  width: calc(100% - 2px);
   cursor: pointer;
   padding: 0 0 0 1.5625rem;
   text-align: left;
@@ -91,7 +94,8 @@
 }
 .deque-table-sortable__group table thead td,
 .deque-table-sortable__group table thead th {
-  padding: 12px 11px 12px 0;
+  padding: 0;
+  height: 41px;
   text-align: left;
   vertical-align: middle;
 }
diff --git a/js/modules/es4/paginate.js b/js/modules/es4/paginate.js
index dbd2f0dc..90d63243 100644
--- a/js/modules/es4/paginate.js
+++ b/js/modules/es4/paginate.js
@@ -73,6 +73,7 @@ const paginationTables = new (function() {
 
     for (let i=0; i<rows.length; i++) {
       rows[i].classList.remove(inactiveClass);
+      rows[i].ariaHidden = false;
     }
 
     table.dataset.currentpage = 0;
@@ -104,8 +105,10 @@ const paginationTables = new (function() {
     for (let x = startIndex; x < rows.length; x++) {
       if (x < start || x >= end) {
         rows[x].classList.add(inactiveClass);
+        rows[x].ariaHidden = true;
       } else {
         rows[x].classList.remove(inactiveClass);
+        rows[x].ariaHidden = false;
       }
     }
 
diff --git a/js/modules/es4/sortable-tables.js b/js/modules/es4/sortable-tables.js
index e38548ca..e614f71d 100644
--- a/js/modules/es4/sortable-tables.js
+++ b/js/modules/es4/sortable-tables.js
@@ -193,6 +193,10 @@ const sortableTables = new(function() {
       )
     }
 
+    const localeCompareFunction = (a, b) => {
+      return a.localeCompare(b);
+    }
+
     const sortByIndex = (rows, index) => {
       const tableHeadings = tableGroup.querySelectorAll('thead th');
       const headerCell = tableHeadings[index];
@@ -203,7 +207,7 @@ const sortableTables = new(function() {
       if (sortType === "number") {
         compareFunc = createCompareFunc(this.functions['exampleCustomCompare'], index);
       } else {
-        compareFunc = createCompareFunc((a, b) => a.localeCompare(b), index);
+        compareFunc = createCompareFunc(localeCompareFunction, index);
       }
 
       rows = tableGroup.querySelectorAll("tbody tr");
diff --git a/js/modules/paginate.js b/js/modules/paginate.js
index cf377b5c..42400a1f 100644
--- a/js/modules/paginate.js
+++ b/js/modules/paginate.js
@@ -75,6 +75,7 @@ const paginationTables = new function() {
 
     for (let i=0; i<rows.length; i++) {
       rows[i].classList.remove(inactiveClass);
+      rows[i].ariaHidden = false;
     }
 
     table.dataset.currentpage = 0;
@@ -106,8 +107,10 @@ const paginationTables = new function() {
     for (let x = startIndex; x < rows.length; x++) {
       if (x < start || x >= end) {
         rows[x].classList.add(inactiveClass);
+        rows[x].ariaHidden = true;
       } else {
         rows[x].classList.remove(inactiveClass);
+        rows[x].ariaHidden = false;
       }
     }
 
diff --git a/js/modules/sortable-tables.js b/js/modules/sortable-tables.js
index c9baadd5..41dabb99 100644
--- a/js/modules/sortable-tables.js
+++ b/js/modules/sortable-tables.js
@@ -193,6 +193,10 @@ const sortableTables = new(function() {
       )
     }
 
+    const localeCompareFunction = (a, b) => {
+      return a.localeCompare(b);
+    }
+
     const sortByIndex = (rows, index) => {
       const tableHeadings = tableGroup.querySelectorAll('thead th');
       const headerCell = tableHeadings[index];
@@ -203,7 +207,7 @@ const sortableTables = new(function() {
       if (sortType === "number") {
         compareFunc = createCompareFunc(this.functions['exampleCustomCompare'], index);
       } else {
-        compareFunc = createCompareFunc((a, b) => a.localeCompare(b), index);
+        compareFunc = createCompareFunc(localeCompareFunction, index);
       }
 
       rows = tableGroup.querySelectorAll("tbody tr");
diff --git a/less/sortable-tables.less b/less/sortable-tables.less
index e83ca03e..7689f622 100644
--- a/less/sortable-tables.less
+++ b/less/sortable-tables.less
@@ -8,9 +8,12 @@
         border-collapse: collapse;
         border-spacing: 0;
         overflow: visible;
-        margin-top: 8px;
         width: 100%;
 
+        &.deque-table-sortable {
+            margin-top: 8px;
+        }
+
         thead {
             border-bottom: 1px solid #e3e3e3;
 
@@ -24,6 +27,7 @@
             th .sortableColumnLabel {
                 display: inline-block;
                 height: 100%;
+                width: calc(100% - 2px);
                 cursor: pointer;
                 padding: 0 0 0 (25 / @px);
                 text-align: left;
@@ -98,7 +102,8 @@
             }
             td,
             th {
-                padding: 12px 11px 12px 0;
+                padding: 0;
+                height: 41px;
                 text-align: left;
                 vertical-align: middle;
             }
@@ -116,4 +121,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file