5 files changed, 33 insertions, 27 deletions
diff --git a/uploader/templates/species/edit-species.html b/uploader/templates/species/edit-species.html
index 6827751..5a26455 100644
--- a/uploader/templates/species/edit-species.html
+++ b/uploader/templates/species/edit-species.html
@@ -107,6 +107,7 @@
              id="txt-species-familyorderid"
              name="species_familyorderid"
              value="{{species.FamilyOrderId}}"
+             required="required"
              class="form-control" />
       <small class="form-text text-muted">
         This is a number that determines the order of the "Family" groupings
@@ -121,7 +122,7 @@
       <input type="number"
              id="txt-species-orderid"
              name="species_orderid"
-             value="{{species.OrderId or max_order_id}}"
+             value="{{species.OrderId or (max_order_id + 5)}}"
              class="form-control" />
       <small class="form-text text-muted">
         This integer value determines the order of the species in relation to
diff --git a/uploader/templates/species/list-species.html b/uploader/templates/species/list-species.html
index 573bcee..85c9d40 100644
--- a/uploader/templates/species/list-species.html
+++ b/uploader/templates/species/list-species.html
@@ -29,29 +29,35 @@
     <caption>Available Species</caption>
     <thead>
       <tr>
-        <th>Common Name</th>
-        <th>Scientific Name</th>
-        <th>TaxonId</th>
-        <th>Use</th>
+        <th>#</td>
+        <th title="A common, layman's name for the species.">Common Name</th>
+        <th title="The scientific name for the species">Organism Name</th>
+        <th title="An identifier for the species in the NCBI taxonomy database">
+          Taxonomy ID
+        </th>
+        <th title="A generic grouping used internally by GeneNetwork for organising species.">
+          Family
+        </th>
       </tr>
     </thead>
     <tbody>
       {%for species in allspecies%}
       <tr>
+        <td>{{species["sequence_number"]}}</td>
         <td>{{species["SpeciesName"]}}</td>
-        <td>{{species["FullName"]}}</td>
-        <td>
-          <a href="https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?id={{species['TaxonomyId']}}"
-             title="View species details on NCBI"
-             target="_blank">{{species["TaxonomyId"]}}</a>
-        </td>
         <td>
           <a href="{{url_for('species.view_species',
                    species_id=species['SpeciesId'])}}"
-             title="">
-            {{species["SpeciesName"]}} ({{species["FullName"]}})
+             title="View details in GeneNetwork on {{species['FullName']}}">
+            {{species["FullName"]}}
           </a>
         </td>
+        <td>
+          <a href="https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?id={{species['TaxonomyId']}}"
+             title="View species details on NCBI"
+             target="_blank">{{species["TaxonomyId"]}}</a>
+        </td>
+        <td>{{species.Family}}</td>
       </tr>
       {%else%}
       <tr>
diff --git a/uploader/templates/species/macro-display-species-card.html b/uploader/templates/species/macro-display-species-card.html
index 857c0f0..166c7b9 100644
--- a/uploader/templates/species/macro-display-species-card.html
+++ b/uploader/templates/species/macro-display-species-card.html
@@ -3,13 +3,19 @@
   <div class="card-body">
     <h5 class="card-title">Species</h5>
     <div class="card-text">
-      <dl>
-        <dt>Common Name</dt>
-        <dd>{{species.SpeciesName}}</dd>
+      <table class="table">
+        <tbody>
+          <tr>
+            <td>Common Name</td>
+            <td>{{species.SpeciesName}}</td>
+          </tr>
 
-        <dt>Scientific Name</dt>
-        <dd>{{species.FullName}}</dd>
-      </dl>
+          <tr>
+            <td>Scientific Name</td>
+            <td>{{species.FullName}}</td>
+          </tr>
+        </tbody>
+      </table>
     </div>
   </div>
 </div>
diff --git a/uploader/templates/species/macro-select-species.html b/uploader/templates/species/macro-select-species.html
index 3dbfc95..dd086c0 100644
--- a/uploader/templates/species/macro-select-species.html
+++ b/uploader/templates/species/macro-select-species.html
@@ -1,10 +1,8 @@
 {%macro select_species_form(form_action, species)%}
 {%if species | length > 0%}
 <form method="GET" action="{{form_action}}">
-  <legend>Select Species</legend>
-
   <div class="form-group">
-    <label for="select-species" class="form-label">Select Species</label>
+    <label for="select-species" class="form-label">Species</label>
     <select id="select-species"
             name="species_id"
             class="form-control"
diff --git a/uploader/templates/species/view-species.html b/uploader/templates/species/view-species.html
index 6942168..b01864d 100644
--- a/uploader/templates/species/view-species.html
+++ b/uploader/templates/species/view-species.html
@@ -40,16 +40,11 @@
 
   <ol>
     <li>
-      <a href="#"
-         title="Upload genotypes for {{species.FullName}}">Upload Genotypes</a>
-    </li>
-    <li>
       <a href="{{url_for('species.populations.list_species_populations',
                species_id=species.SpeciesId)}}"
          title="Create/Edit populations for {{species.FullName}}">
         Manage populations</a>
     </li>
-    <li><a href="#" title="">any other action, perhaps &hellip;</a></li>
   </ol>