3 files changed, 28 insertions, 12 deletions

diff --git a/templates/default-layout.cassius b/templates/default-layout.cassius
index c622901..31389d8 100644
--- a/templates/default-layout.cassius
+++ b/templates/default-layout.cassius
@@ -1,4 +1,4 @@
-.main
+main
   min-width: 20em
 .table, table
   display: table
@@ -62,7 +62,7 @@ table table td, table table th, .table table td, .table table th
       li:first-child::before
         content: ""
 button
-  width: 6em
+  width: 8em
   display: inline-block
 .sepBelow, .sepAbove
   border: 2px none #ddd
diff --git a/templates/inventoryListing.cassius b/templates/inventoryListing.cassius
index 5116667..dc01471 100644
--- a/templates/inventoryListing.cassius
+++ b/templates/inventoryListing.cassius
@@ -26,4 +26,6 @@ div.itemId
     padding: 0
     margin: 0
     input
-      vertical-align: middle
\ No newline at end of file
+      vertical-align: middle
+.actions .td
+  width: 8em
\ No newline at end of file
diff --git a/templates/inventoryListing.hamlet b/templates/inventoryListing.hamlet
index cc1c9ce..8eee3e7 100644
--- a/templates/inventoryListing.hamlet
+++ b/templates/inventoryListing.hamlet
@@ -36,12 +36,14 @@
               <hr>
             $of DateKnown d
               #{dayFormat d}
+            $of DateNever
         <div .td .day>
           $case itemExpires
             $of DateNever
               <hr>
             $of DateKnown d
               <span :d < today:.expired :d < addDays 7 today:.expireWeek :d < addGregorianMonthsRollOver 1 today:.expireMonth>#{dayFormat d}
+            $of DateUnknown
         <div .td .day>
           $case itemOpened
             $of DateKnown d
@@ -49,17 +51,29 @@
             $of DateUnknown
               Yes
             $of DateNever
-              <form method=post action=@{OpenItemR itemId}>
-                <button type=submit>
-                  Open
         <div .td>
           <ul .status>
             $if itemRunningLow
               <li>Running low
         <div .td>
-          <form method=get action=@{UpdateItemR itemId}##{toPathPiece itemId}>
-            <button type=submit>
-              Edit
-          <form method=post action=@{DeleteItemR itemId}>
-            <button type=submit>
-              Delete
+          <div .table .actions>
+            <div .tr>
+              $if isNever itemOpened
+                <form method=post action=@{OpenItemR itemId}>
+                  <button type=submit>
+                    Open
+              $else
+                <div .td>&nbsp;
+              <form method=get action=@{UpdateItemR itemId}##{toPathPiece itemId} .td>
+                <button type=submit>
+                  Edit
+            <div .tr>
+              $if not itemRunningLow
+                <form method=post action=@{LowItemR itemId} .td>
+                  <button type=submit>
+                    Running low
+              $else
+                <div .td>&nbsp;
+              <form method=post action=@{DeleteItemR itemId} .td>
+                <button type=submit>
+                  Delete