diff --git a/templates/default/css/foundation.mods.css b/templates/default/css/foundation.mods.css
index efbaf60..e1cd436 100755
--- a/templates/default/css/foundation.mods.css
+++ b/templates/default/css/foundation.mods.css
@@ -72,3 +72,31 @@ div.off-canvas .user {
     background: #1779ba;
     color: #fefefe !important;
 }
+
+.has-tip {
+    font-weight: normal;
+}
+
+div.time-duration-picker-content table {
+    margin: 0px;
+}
+
+div.time-duration-picker-content td {
+    padding: 0.2rem;
+}
+
+div.time-duration-picker-content td select {
+    margin: 0px;
+}
+
+.form-left {
+    padding-right: 0.25rem;
+}
+
+.form-right {
+    padding-left: 0.25rem;
+}
+
+.spacer {
+    margin-bottom: 1rem;
+}
\ No newline at end of file
diff --git a/templates/default/css/messagebox.css b/templates/default/css/messagebox.css
index 6ac04a0..146341b 100644
--- a/templates/default/css/messagebox.css
+++ b/templates/default/css/messagebox.css
@@ -18,4 +18,8 @@
 
 .messagebox h4 {
     border-bottom: 1px solid #888;
-}
\ No newline at end of file
+}
+
+input.has-tip {
+    border-bottom: 1px solid #cacaca;
+}
diff --git a/templates/default/view/content.tem b/templates/default/view/content.tem
index aabb1dd..39d71e6 100644
--- a/templates/default/view/content.tem
+++ b/templates/default/view/content.tem
@@ -2,36 +2,36 @@
      <div>
          <h3>%(name)s</h3>
          <div class="grid-x grid-margin-x">
-             <div class="cell medium-2  medium-text-right title">{L_VIEW_SOURCE}</div>
-             <div class="cell medium-10 text-left">%(source)s</div>
+             <div class="cell medium-2 small-1 text-right title"><i class="fa fa-link hide-for-print hide-for-medium" aria-hidden="true"></i> <span class="show-for-medium">{L_VIEW_SOURCE}</span></div>
+             <div class="cell medium-10 small-11 text-left">%(source)s</div>
          </div>
          <div class="grid-x grid-margin-x">
-             <div class="cell medium-2  medium-text-right title">{L_VIEW_YIELD}</div>
-             <div class="cell medium-10 text-left">%(yield)s</div>
+             <div class="cell medium-2 small-1 text-right title"><i class="fa fa-utensils hide-for-print hide-for-medium" aria-hidden="true"></i> <span class="show-for-medium">{L_VIEW_YIELD}</span></div>
+             <div class="cell medium-10 small-11 text-left">%(yield)s</div>
          </div>
          <div class="grid-x grid-margin-x">
-             <div class="cell medium-2  medium-text-right title">{L_VIEW_PREPINFO}</div>
-             <div class="cell medium-10 text-left">%(timereq)s</div>
+             <div class="cell medium-2 small-1 text-right title"><i class="fa fa-tasks hide-for-print hide-for-medium" aria-hidden="true"></i> <span class="show-for-medium">{L_VIEW_PREPINFO}</span></div>
+             <div class="cell medium-10 small-11 text-left">%(timereq)s</div>
          </div>
          <div class="grid-x grid-margin-x">
-             <div class="cell medium-2  medium-text-right title">{L_VIEW_TIMEREQ}</div>
-             <div class="cell medium-10 text-left">%(timemins)s</div>
+             <div class="cell medium-2 small-1 text-right title"><i class="fa fa-clock hide-for-print hide-for-medium" aria-hidden="true"></i> <span class="show-for-medium">{L_VIEW_TIMEREQ}</span></div>
+             <div class="cell medium-10 small-11 text-left">%(timemins)s</div>
          </div>
          <div class="grid-x grid-margin-x">
-             <div class="cell medium-2  medium-text-right title">{L_VIEW_OVENTEMP}</div>
-             <div class="cell medium-10 text-left">%(temp)s%(temptype)s</div>
+             <div class="cell medium-2 small-1 text-right title"><i class="fa fa-thermometer-three-quarters hide-for-print hide-for-medium" aria-hidden="true"></i> <span class="show-for-medium">{L_VIEW_OVENTEMP}</span></div>
+             <div class="cell medium-10 small-11 text-left">%(temp)s%(temptype)s</div>
          </div>
          <div class="grid-x grid-margin-x">
-             <div class="cell medium-2  medium-text-right title">{L_VIEW_TYPE}</div>
-             <div class="cell medium-10 text-left">%(type)s</div>
+             <div class="cell medium-2 small-1 text-right title"><i class="fa fa-book hide-for-print hide-for-medium" aria-hidden="true"></i> <span class="show-for-medium">{L_VIEW_TYPE}</span></div>
+             <div class="cell medium-10 small-11 text-left">%(type)s</div>
          </div>
          <div class="grid-x grid-margin-x">
-             <div class="cell medium-2  medium-text-right title">{L_VIEW_STATUS}</div>
-             <div class="cell medium-10 text-left">%(status)s</div>
+             <div class="cell medium-2 small-1 text-right title"><i class="fa fa-star hide-for-print hide-for-medium" aria-hidden="true"></i> <span class="show-for-medium">{L_VIEW_STATUS}</span></div>
+             <div class="cell medium-10 small-11 text-left">%(status)s</div>
          </div>
          <div class="grid-x grid-margin-x">
-             <div class="cell medium-2  medium-text-right title">{L_VIEW_TAGS}</div>
-             <div class="cell medium-10 text-left">%(tags)s</div>
+             <div class="cell medium-2 small-1 text-right title"><i class="fa fa-tags hide-for-print hide-for-medium" aria-hidden="true"></i> <span class="show-for-medium">{L_VIEW_TAGS}</span></div>
+             <div class="cell medium-10 small-11 text-left">%(tags)s</div>
          </div>
      </div>
      <div class="ingredients">
diff --git a/templates/default/view/controls-enabled.tem b/templates/default/view/controls-enabled.tem
index 97f3f7c..70e3977 100644
--- a/templates/default/view/controls-enabled.tem
+++ b/templates/default/view/controls-enabled.tem
@@ -1,4 +1,4 @@
-<div class="cell button-group align-right">
+<div class="cell button-group align-right hide-for-print">
     <a href="%(url-edit)s"   class="button" title="Edit"><i class="fa fa-edit" aria-hidden="true"></i> {L_VIEW_EDIT}</a>
     <a href="%(url-clone)s"  class="button" title="Clone"><i class="fa fa-copy" aria-hidden="true"></i> {L_VIEW_CLONE}</a>
     <a href="%(url-delete)s" class="button alert" title="Delete"><i class="fa fa-trash" aria-hidden="true"></i> {L_VIEW_DELETE}</a>