From 5ded29ef7c859653fdf184af0b64f1a8960941b9 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 31 Aug 2019 14:24:32 +1200
Subject: [PATCH 001/142] Allow anyone to view followers - and tidy up display

fixes #2106
---
 app/controllers/follows_controller.rb |  1 -
 app/models/ability.rb                 |  4 ++--
 app/views/follows/followers.html.haml | 20 ++++++++------------
 app/views/follows/index.html.haml     | 19 +++++++------------
 4 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb
index 15546742f..1555a4a7c 100644
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -1,5 +1,4 @@
 class FollowsController < ApplicationController
-  before_action :authenticate_member!
   before_action :set_member, only: %i(index followers)
   load_and_authorize_resource
   skip_load_resource only: :create
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 66c48a8c4..f8b05d3cf 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -12,8 +12,8 @@ class Ability
 
     # everyone can do these things, even non-logged in
     can :read, :all
-    can :view_follows, Member
-    can :view_followers, Member
+    can :read, Follow
+    can :followers, Follow
 
     # Everyone can see the charts
     can :timeline, Garden
diff --git a/app/views/follows/followers.html.haml b/app/views/follows/followers.html.haml
index 1aea716bd..3262de360 100644
--- a/app/views/follows/followers.html.haml
+++ b/app/views/follows/followers.html.haml
@@ -1,16 +1,12 @@
 - content_for :title, "#{@member.login_name}'s followers"
 
-.pagination
-  = page_entries_info @followers
-  = will_paginate @followers
 
-.row
-  .col-md-12
-    - @followers.each do |f|
-      .col-md-4.three-across
-        .thumbnail
-          = render partial: "members/thumbnail", locals: { member: f }
+%h1.page-title #{@member.login_name}'s followers
 
-.pagination
-  = page_entries_info @followers
-  = will_paginate @followers
+= page_entries_info @followers
+= will_paginate @followers
+
+.index-cards= render @followers
+
+= page_entries_info @followers
+= will_paginate @followers
diff --git a/app/views/follows/index.html.haml b/app/views/follows/index.html.haml
index ecd7bae2e..ec7d97d35 100644
--- a/app/views/follows/index.html.haml
+++ b/app/views/follows/index.html.haml
@@ -1,16 +1,11 @@
 - content_for :title, "#{@member.login_name}'s follows"
 
-.pagination
-  = page_entries_info @follows
-  = will_paginate @follows
+%h1.page-title #{@member.login_name}'s follows
 
-.row
-  .col-md-12
-    - @follows.each do |f|
-      .col-md-4.three-across
-        .thumbnail
-          = render partial: "members/thumbnail", locals: { member: f }
+= page_entries_info @follows
+= will_paginate @follows
 
-.pagination
-  = page_entries_info @follows
-  = will_paginate @follows
+.index-cards= render @follows
+
+= page_entries_info @follows
+= will_paginate @follows

From 2a55f61a4c948a3af8d25a1a95405d42ec443e00 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 16:29:50 +1200
Subject: [PATCH 002/142] Section padding

fixes #2105
---
 app/assets/stylesheets/overrides.scss | 2 +-
 app/views/plantings/show.html.haml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index 79db1fb4a..08949e555 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -4,8 +4,8 @@ body {
 }
 
 section {
-  padding-top: 1em;
   margin: 0;
+  padding-bottom: 1em;
 }
 
 .ellipsis {
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index 2554a9421..160c7d031 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -36,6 +36,6 @@
   .row
     .col-md-12
       %hr/
-      = render 'plantings/harvests', planting: @planting
+      %section= render 'plantings/harvests', planting: @planting
       %hr/
-      = render 'plantings/descendants', planting: @planting
+      %section= render 'plantings/descendants', planting: @planting

From e4908fe299f3ad7a1c5c489567b447514c19b53f Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 18:42:57 +1200
Subject: [PATCH 003/142] Removing unused styles

---
 app/assets/stylesheets/_crops.scss            |  11 ++
 app/assets/stylesheets/_homepage.scss         |  34 +++-
 app/assets/stylesheets/_maps.scss             |   9 +
 app/assets/stylesheets/_members.scss          |  18 ++
 ...notifications.scss => _notifications.scss} |   0
 .../stylesheets/{posts.scss => _posts.scss}   |   4 +
 app/assets/stylesheets/application.scss       |   6 +-
 app/assets/stylesheets/overrides.scss         | 161 ++----------------
 8 files changed, 84 insertions(+), 159 deletions(-)
 create mode 100644 app/assets/stylesheets/_maps.scss
 rename app/assets/stylesheets/{notifications.scss => _notifications.scss} (100%)
 rename app/assets/stylesheets/{posts.scss => _posts.scss} (54%)

diff --git a/app/assets/stylesheets/_crops.scss b/app/assets/stylesheets/_crops.scss
index 26fb947e6..839396130 100644
--- a/app/assets/stylesheets/_crops.scss
+++ b/app/assets/stylesheets/_crops.scss
@@ -19,3 +19,14 @@
   background-color: $white;
   padding: 1em;
 }
+
+li.crop-hierarchy {
+  list-style-type: disc;
+}
+
+#add-sci_name-row,
+#remove-sci_name-row,
+#add-alt_name-row,
+#remove-alt_name-row {
+  display: none;
+}
diff --git a/app/assets/stylesheets/_homepage.scss b/app/assets/stylesheets/_homepage.scss
index 17243ba8b..749cc541b 100644
--- a/app/assets/stylesheets/_homepage.scss
+++ b/app/assets/stylesheets/_homepage.scss
@@ -1,19 +1,33 @@
 // signup widget on homepage
-.jumbotron .signup {
-  background-color: lighten($green, 40%);
-  border: 1px solid lighten($green, 20%);
-  border-radius: 6px;
-  line-height: 200%;
-  padding: 15px;
-  text-align: center;
+
+// let's condense the hero unit a little
+.jumbotron {
+  background-color: darken($beige, 10%);
+  padding-top: 30px;
+  padding-bottom: 30px;
+
+  // signup widget on homepage
+  .signup {
+    background-color: lighten($green, 40%);
+    border-radius: 6px;
+    border: 1px solid lighten($green, 20%);
+    line-height: 200%;
+    padding: 15px;
+    text-align: center;
+  }
+
+  .info {
+    padding: 0.5em;
+    text-align: center;
+  }
 }
 
+// info under the main heading on homepage
 .homepage-cards {
   display: flex;
   flex: none;
   flex-wrap: wrap;
   margin: .5em;
-  // left: -.5em;
 
   .card {
     left: -.5em;
@@ -52,6 +66,10 @@
   }
 }
 
+// stats shown on homepage. eg. "999 members..."
+p.stats {
+  font-weight: bold;
+}
 
 @include media-breakpoint-down(sm) {
   .homepage-cards {
diff --git a/app/assets/stylesheets/_maps.scss b/app/assets/stylesheets/_maps.scss
new file mode 100644
index 000000000..0956b5f78
--- /dev/null
+++ b/app/assets/stylesheets/_maps.scss
@@ -0,0 +1,9 @@
+#placesmap,
+#cropmap {
+  height: 500px;
+}
+
+#membermap {
+  height: 250px;
+  z-index: 0;
+}
diff --git a/app/assets/stylesheets/_members.scss b/app/assets/stylesheets/_members.scss
index 758aff496..8884c1d14 100644
--- a/app/assets/stylesheets/_members.scss
+++ b/app/assets/stylesheets/_members.scss
@@ -38,3 +38,21 @@
     width: 30px;
   }
 }
+
+
+.member-location {
+  font-size: small;
+  font-style: italic;
+}
+
+.member-location a {
+  color: $brown;
+}
+
+.location-not-set {
+  background-image: image-url('location-not-set.en.png');
+  background-position: center;
+  background-repeat: no-repeat;
+  height: 250px;
+  width: 100%;
+}
diff --git a/app/assets/stylesheets/notifications.scss b/app/assets/stylesheets/_notifications.scss
similarity index 100%
rename from app/assets/stylesheets/notifications.scss
rename to app/assets/stylesheets/_notifications.scss
diff --git a/app/assets/stylesheets/posts.scss b/app/assets/stylesheets/_posts.scss
similarity index 54%
rename from app/assets/stylesheets/posts.scss
rename to app/assets/stylesheets/_posts.scss
index d7f80d0aa..f47628c57 100644
--- a/app/assets/stylesheets/posts.scss
+++ b/app/assets/stylesheets/_posts.scss
@@ -1,3 +1,7 @@
+
+.post-actions {
+  margin-bottom: 1rem;
+}
 .post-content {
   img {
     max-width: 100%;
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 15c7d43c2..be50fd6a9 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -16,15 +16,17 @@
 @import 'rails_bootstrap_forms';
 
 @import 'overrides';
+
 @import 'crops';
 @import 'harvests';
 @import 'likes';
 @import 'members';
 @import 'notifications';
 @import 'plantings';
+@import 'photos';
 @import 'posts';
-@import 'predictions';
 @import 'seeds';
 
+@import 'predictions';
 @import 'homepage';
-@import 'photos';
+@import 'maps';
diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index 79db1fb4a..dcd5ed701 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -1,11 +1,16 @@
+html,
+body {
+  height: 100%;
+}
+
 body {
   background-color: $beige;
   font-family: $font-family-sans-serif;
 }
 
 section {
-  padding-top: 1em;
   margin: 0;
+  padding-top: 1em;
 }
 
 .ellipsis {
@@ -28,15 +33,10 @@ a:hover {
   color: $blue;
 }
 
-.list-inline > li.first {
+ul.list-inline > li.first {
   padding-left: 0;
 }
 
-.activity-list {
-  list-style-type: none;
-  padding: 0;
-}
-
 h2 {
   font-size: 150%;
 }
@@ -45,10 +45,6 @@ h3 {
   font-size: 120%;
 }
 
-.main {
-  padding-right: 1em;
-}
-
 #navbar-search {
   .input-group {
     input {
@@ -77,45 +73,23 @@ img.img-icon {
   width: 1.2em;
 }
 
-.img-square {
-  height: 150px;
-  object-fit: cover;
-  width: 150px;
-}
-
-.img-card {
+img.img-card {
   height: 180px;
   object-fit: cover;
   width: 100%;
 }
 
-.img-responsive {
+img.img-responsive {
   max-width: 100%;
 }
 
-.avatar {
+img.avatar {
   border-radius: 50%;
   padding: 1em;
   position: relative;
   z-index: 2;
 }
 
-.profile-sidebar {
-  margin-top: -5rem;
-}
-
-.profile-activity {
-  background: $white;
-  margin-top: 2em;
-  padding: 2em;
-}
-
-.sidebar {
-  border-left: 1px solid darken($beige, 10%);
-  margin-left: -1px;
-  padding-left: 1em;
-}
-
 // this is used for eg. crops and members index pages
 .six-across:nth-child(6n+1) {
   margin-left: 0;
@@ -126,41 +100,6 @@ img.img-icon {
   margin-left: 0;
 }
 
-// let's condense the hero unit a little
-.jumbotron {
-  background-color: darken($beige, 10%);
-  padding-top: 30px;
-  padding-bottom: 30px;
-  // signup widget on homepage
-  .signup {
-    background-color: lighten($green, 40%);
-    border-radius: 6px;
-    border: 1px solid lighten($green, 20%);
-    line-height: 200%;
-    padding: 15px;
-    text-align: center;
-  }
-}
-
-// info under the main heading on homepage
-.jumbotron .info {
-  //padding-top: 15px
-  padding: 0.5em;
-  text-align: center;
-}
-
-
-// stats shown on homepage. eg. "999 members..."
-p.stats {
-  font-weight: bold;
-}
-
-.card-row {
-  display: grid;
-  grid-gap: 25px;
-  grid-row-gap: 5px;
-  grid-template-columns: 50% 50%;
-}
 .card {
   margin-bottom: 1em
 }
@@ -173,55 +112,15 @@ p.stats {
   }
 }
 
-#placesmap,
-#cropmap {
-  height: 500px;
-}
-
-#membermap {
-  height: 250px;
-  z-index: 0;
-}
-
-.location-not-set {
-  background-image: image-url('location-not-set.en.png');
-  background-position: center;
-  background-repeat: no-repeat;
-  height: 250px;
-  width: 100%;
-}
-
-.member-location {
-  font-size: small;
-  font-style: italic;
-}
-
-.member-location a {
-  color: $brown;
-}
-
-.associations {
+ul.associations {
   list-style-type: none;
 }
 
-
-li.crop-hierarchy {
-  list-style-type: disc;
-}
-
-.navbar-brand {
+a.navbar-brand {
   margin: 0;
   padding: 0;
 }
 
-.navbar-bottom {
-  margin: 40px 0 0 !important;
-}
-
-.post-actions {
-  margin-bottom: 1rem;
-}
-
 // footer
 footer {
   #footer1,
@@ -259,19 +158,6 @@ footer {
   min-height: 80%;
 }
 
-#global-actions {
-  padding-top: 10px;
-}
-
-html,
-body {
-  height: 100%;
-}
-
-.member-image {
-  border-radius: 50%;
-}
-
 // Autosuggest
 .ui-autocomplete {
   background: $white;
@@ -298,17 +184,6 @@ $state-success-bg: lighten($green, 50%);
   display: none;
 }
 
-#add-sci_name-row,
-#remove-sci_name-row,
-#add-alt_name-row,
-#remove-alt_name-row {
-  display: none;
-}
-
-.panel-footer {
-  height: 6em;
-}
-
 .panel {
   .dl-horizontal {
     text-overflow: ellipsis;
@@ -321,14 +196,6 @@ label.required:after {
   content:" *";
 }
 
-.margin-bottom {
-  margin-bottom: 1em;
-}
-
-.red {
-  color: red;
-}
-
 .truncate {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -353,10 +220,6 @@ ul.thumbnail-buttons {
   visibility: visible;
 }
 
-.homepage-listing {
-  padding-bottom: 6px;
-}
-
 .container {
   max-width: 1500px;
 }

From 017a942a410afc8efc26b985a85d17ee9ad3c289 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 19:58:47 +1200
Subject: [PATCH 004/142] Rename classes to name codeclimate happy

---
 app/assets/javascripts/crops.js.coffee      | 16 ++++++++--------
 app/assets/stylesheets/_crops.scss          |  8 ++++----
 app/views/crops/_form.html.haml             |  8 ++++----
 spec/features/crops/creating_a_crop_spec.rb |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/crops.js.coffee b/app/assets/javascripts/crops.js.coffee
index 6a0a27123..151562686 100644
--- a/app/assets/javascripts/crops.js.coffee
+++ b/app/assets/javascripts/crops.js.coffee
@@ -1,20 +1,20 @@
 jQuery ->
-  $('#add-sci_name-row').css("display", "inline-block")
-  $('#remove-sci_name-row').css("display", "inline-block")
-  $("#add-alt_name-row").css("display", "inline-block")
-  $("#remove-alt_name-row").css("display", "inline-block")
+  $('#add-sciname-row').css("display", "inline-block")
+  $('#remove-sciname-row').css("display", "inline-block")
+  $("#add-altname-row").css("display", "inline-block")
+  $("#remove-altname-row").css("display", "inline-block")
 
 -$ ->
   sci_template = "<div id='sci_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Scientific name INDEX:</label></div><div class='col-md-8'><input name='sci_name[INDEX]' class='form-control', id='sci_name[INDEX]')'></input><span class='help-block'>Scientific name of crop.</span></div><div class='col-md-2'></div></div>"
 
   sci_index = $('#scientific_names .template').length + 1
 
-  $('#add-sci_name-row').click ->
+  $('#add-sciname-row').click ->
     compiled_input = $(sci_template.split("INDEX").join(sci_index))
     $('#scientific_names').append(compiled_input)
     sci_index = sci_index + 1
 
-  $('#remove-sci_name-row').click ->
+  $('#remove-sciname-row').click ->
     if (sci_index > 2)
       sci_index = sci_index - 1
       tmp = 'sci_template[' + sci_index + ']'
@@ -25,12 +25,12 @@ jQuery ->
 
   alt_index = $('#alternate_names .template').length + 1
 
-  $('#add-alt_name-row').click ->
+  $('#add-altname-row').click ->
     compiled_input = $(alt_template.split("INDEX").join(alt_index))
     $('#alternate_names').append(compiled_input)
     alt_index = alt_index + 1
 
-  $('#remove-alt_name-row').click ->
+  $('#remove-altname-row').click ->
     if (alt_index > 2)
       alt_index = alt_index - 1
       tmp = 'alt_template[' + alt_index + ']'
diff --git a/app/assets/stylesheets/_crops.scss b/app/assets/stylesheets/_crops.scss
index 839396130..b7b7d4895 100644
--- a/app/assets/stylesheets/_crops.scss
+++ b/app/assets/stylesheets/_crops.scss
@@ -24,9 +24,9 @@ li.crop-hierarchy {
   list-style-type: disc;
 }
 
-#add-sci_name-row,
-#remove-sci_name-row,
-#add-alt_name-row,
-#remove-alt_name-row {
+#add-sciname-row,
+#remove-sciname-row,
+#add-altname-row,
+#remove-altname-row {
   display: none;
 }
diff --git a/app/views/crops/_form.html.haml b/app/views/crops/_form.html.haml
index 53c329f7c..870daaa08 100644
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -54,8 +54,8 @@
 
       -# Everyone (wranglers and requesters) gets to add scientific names
       %h2 Scientific names
-      = button_tag "+", id: "add-sci_name-row", type: "button"
-      = button_tag "-", id: "remove-sci_name-row", type: "button"
+      = button_tag "+", id: "add-sciname-row", type: "button"
+      = button_tag "-", id: "remove-sciname-row", type: "button"
 
       .form-group#scientific_names
         - @crop.scientific_names.each.with_index do |sci, index|
@@ -66,8 +66,8 @@
               = text_field_tag "sci_name[#{index + 1}]", sci.name, id: "sci_name[#{index + 1}]", class: 'form-control'
               %span.help-block Scientific name of crop.
       %h2 Alternate names
-      = button_tag "+", id: "add-alt_name-row", type: "button"
-      = button_tag "-", id: "remove-alt_name-row", type: "button"
+      = button_tag "+", id: "add-altname-row", type: "button"
+      = button_tag "-", id: "remove-altname-row", type: "button"
 
       .form-group#alternate_names
         - @crop.alternate_names.each.with_index do |alt, index|
diff --git a/spec/features/crops/creating_a_crop_spec.rb b/spec/features/crops/creating_a_crop_spec.rb
index 21178ac92..9b542b822 100644
--- a/spec/features/crops/creating_a_crop_spec.rb
+++ b/spec/features/crops/creating_a_crop_spec.rb
@@ -7,14 +7,14 @@ describe "Crop", js: true do
       within "form#new_crop" do
         fill_in "crop_name", with: "Philippine flower"
         fill_in "en_wikipedia_url", with: "https://en.wikipedia.org/wiki/Jasminum_sambac"
-        click_button "add-sci_name-row"
+        click_button "add-sciname-row"
         fill_in "sci_name[1]", with: "Jasminum sambac 1"
         fill_in "sci_name[2]", with: "Jasminum sambac 2"
         fill_in "alt_name[1]", with: "Sampaguita"
-        click_button "add-alt_name-row"
-        click_button "add-alt_name-row"
+        click_button "add-altname-row"
+        click_button "add-altname-row"
         fill_in "alt_name[2]", with: "Manol"
-        click_button "add-alt_name-row"
+        click_button "add-altname-row"
         fill_in "alt_name[3]", with: "Jazmin"
         fill_in "alt_name[4]", with: "Matsurika"
       end

From 2c75f62caf0e0a781f43359c86b67a8ab1abdb57 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 20:23:59 +1200
Subject: [PATCH 005/142] Avoid using id selectors

---
 app/assets/javascripts/crops.js.coffee | 16 ++++++++--------
 app/assets/stylesheets/_crops.scss     | 10 +++++-----
 app/views/crops/_form.html.haml        |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/crops.js.coffee b/app/assets/javascripts/crops.js.coffee
index 151562686..5e96b90e0 100644
--- a/app/assets/javascripts/crops.js.coffee
+++ b/app/assets/javascripts/crops.js.coffee
@@ -1,20 +1,20 @@
 jQuery ->
-  $('#add-sciname-row').css("display", "inline-block")
-  $('#remove-sciname-row').css("display", "inline-block")
-  $("#add-altname-row").css("display", "inline-block")
-  $("#remove-altname-row").css("display", "inline-block")
+  $('.add-sciname-row').css("display", "inline-block")
+  $('.remove-sciname-row').css("display", "inline-block")
+  $(".add-altname-row").css("display", "inline-block")
+  $(".remove-altname-row").css("display", "inline-block")
 
 -$ ->
   sci_template = "<div id='sci_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Scientific name INDEX:</label></div><div class='col-md-8'><input name='sci_name[INDEX]' class='form-control', id='sci_name[INDEX]')'></input><span class='help-block'>Scientific name of crop.</span></div><div class='col-md-2'></div></div>"
 
   sci_index = $('#scientific_names .template').length + 1
 
-  $('#add-sciname-row').click ->
+  $('.add-sciname-row').click ->
     compiled_input = $(sci_template.split("INDEX").join(sci_index))
     $('#scientific_names').append(compiled_input)
     sci_index = sci_index + 1
 
-  $('#remove-sciname-row').click ->
+  $('.remove-sciname-row').click ->
     if (sci_index > 2)
       sci_index = sci_index - 1
       tmp = 'sci_template[' + sci_index + ']'
@@ -25,12 +25,12 @@ jQuery ->
 
   alt_index = $('#alternate_names .template').length + 1
 
-  $('#add-altname-row').click ->
+  $('.add-altname-row').click ->
     compiled_input = $(alt_template.split("INDEX").join(alt_index))
     $('#alternate_names').append(compiled_input)
     alt_index = alt_index + 1
 
-  $('#remove-altname-row').click ->
+  $('.remove-altname-row').click ->
     if (alt_index > 2)
       alt_index = alt_index - 1
       tmp = 'alt_template[' + alt_index + ']'
diff --git a/app/assets/stylesheets/_crops.scss b/app/assets/stylesheets/_crops.scss
index b7b7d4895..8c05b9652 100644
--- a/app/assets/stylesheets/_crops.scss
+++ b/app/assets/stylesheets/_crops.scss
@@ -20,13 +20,13 @@
   padding: 1em;
 }
 
-li.crop-hierarchy {
+.crop-hierarchy {
   list-style-type: disc;
 }
 
-#add-sciname-row,
-#remove-sciname-row,
-#add-altname-row,
-#remove-altname-row {
+.add-sciname-row,
+.remove-sciname-row,
+.add-altname-row,
+.remove-altname-row {
   display: none;
 }
diff --git a/app/views/crops/_form.html.haml b/app/views/crops/_form.html.haml
index 870daaa08..4c087ff5d 100644
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -54,8 +54,8 @@
 
       -# Everyone (wranglers and requesters) gets to add scientific names
       %h2 Scientific names
-      = button_tag "+", id: "add-sciname-row", type: "button"
-      = button_tag "-", id: "remove-sciname-row", type: "button"
+      = button_tag "+", class: "add-sciname-row", type: "button"
+      = button_tag "-", class: "remove-sciname-row", type: "button"
 
       .form-group#scientific_names
         - @crop.scientific_names.each.with_index do |sci, index|
@@ -66,8 +66,8 @@
               = text_field_tag "sci_name[#{index + 1}]", sci.name, id: "sci_name[#{index + 1}]", class: 'form-control'
               %span.help-block Scientific name of crop.
       %h2 Alternate names
-      = button_tag "+", id: "add-altname-row", type: "button"
-      = button_tag "-", id: "remove-altname-row", type: "button"
+      = button_tag "+", class: "add-altname-row", type: "button"
+      = button_tag "-", class: "remove-altname-row", type: "button"
 
       .form-group#alternate_names
         - @crop.alternate_names.each.with_index do |alt, index|

From c122aa41d3ccb14deb2eb3d9212d13ac1cd32d2b Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 20:30:19 +1200
Subject: [PATCH 006/142] Scss lint

---
 app/assets/stylesheets/_homepage.scss |  8 ++++----
 app/assets/stylesheets/overrides.scss | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/_homepage.scss b/app/assets/stylesheets/_homepage.scss
index 749cc541b..4910436af 100644
--- a/app/assets/stylesheets/_homepage.scss
+++ b/app/assets/stylesheets/_homepage.scss
@@ -3,21 +3,21 @@
 // let's condense the hero unit a little
 .jumbotron {
   background-color: darken($beige, 10%);
-  padding-top: 30px;
   padding-bottom: 30px;
+  padding-top: 30px;
 
   // signup widget on homepage
   .signup {
     background-color: lighten($green, 40%);
-    border-radius: 6px;
     border: 1px solid lighten($green, 20%);
+    border-radius: 6px;
     line-height: 200%;
     padding: 15px;
     text-align: center;
   }
 
   .info {
-    padding: 0.5em;
+    padding: .5em;
     text-align: center;
   }
 }
@@ -67,7 +67,7 @@
 }
 
 // stats shown on homepage. eg. "999 members..."
-p.stats {
+.stats {
   font-weight: bold;
 }
 
diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index dcd5ed701..e85a03eeb 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -21,6 +21,11 @@ section {
 
 a {
   color: $green;
+
+  .navbar-brand {
+    margin: 0;
+    padding: 0;
+  }
 }
 
 a:hover {
@@ -116,11 +121,6 @@ ul.associations {
   list-style-type: none;
 }
 
-a.navbar-brand {
-  margin: 0;
-  padding: 0;
-}
-
 // footer
 footer {
   #footer1,

From c53015b922bb02c93545b6b4e6a60165714f42a4 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 20:34:34 +1200
Subject: [PATCH 007/142] Scss lint

---
 app/assets/stylesheets/_posts.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/_posts.scss b/app/assets/stylesheets/_posts.scss
index f47628c57..331c91e53 100644
--- a/app/assets/stylesheets/_posts.scss
+++ b/app/assets/stylesheets/_posts.scss
@@ -2,6 +2,7 @@
 .post-actions {
   margin-bottom: 1rem;
 }
+
 .post-content {
   img {
     max-width: 100%;

From f121f7f3fee6a56f3562a9a7e16bb3789b4eca75 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 20:41:12 +1200
Subject: [PATCH 008/142] Place map on a high zindex, but below the menu

---
 app/assets/stylesheets/_maps.scss | 8 ++++----
 app/views/crops/show.html.haml    | 2 +-
 app/views/members/_map.html.haml  | 2 +-
 app/views/places/index.html.haml  | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/_maps.scss b/app/assets/stylesheets/_maps.scss
index 0956b5f78..b92ee2283 100644
--- a/app/assets/stylesheets/_maps.scss
+++ b/app/assets/stylesheets/_maps.scss
@@ -1,9 +1,9 @@
-#placesmap,
-#cropmap {
+.map {
   height: 500px;
+  z-index: 2;
 }
 
-#membermap {
+.member-map {
   height: 250px;
-  z-index: 0;
+  z-index: 2;
 }
diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index b7f6d5254..e81ee11b1 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -60,7 +60,7 @@
       Only plantings by members who have set their locations are shown on this map.
       - if current_member && current_member.location.blank?
         = link_to "Set your location.", edit_member_registration_path
-    #cropmap
+    #cropmap.map
 
     = render 'crops/posts', crop: @crop
 
diff --git a/app/views/members/_map.html.haml b/app/views/members/_map.html.haml
index 77a46614e..6a2060043 100644
--- a/app/views/members/_map.html.haml
+++ b/app/views/members/_map.html.haml
@@ -1,5 +1,5 @@
 - if member.latitude && member.longitude
-  #membermap
+  #membermap.member-map
   %p.text-right
     See other members, plantings, seeds and more near
     = link_to member.location, place_path(member.location, anchor: "members")
diff --git a/app/views/places/index.html.haml b/app/views/places/index.html.haml
index f8537827a..ebc180a81 100644
--- a/app/views/places/index.html.haml
+++ b/app/views/places/index.html.haml
@@ -1,4 +1,3 @@
 - content_for :title, t(".title", site_name: ENV['GROWSTUFF_SITE_NAME'])
 = render partial: 'search_form'
-#placesmap
-
+#placesmap.map

From a50b0485ac14661529a325b12fb905ae12983147 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 20:46:46 +1200
Subject: [PATCH 009/142] find button by class

---
 spec/features/crops/creating_a_crop_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/features/crops/creating_a_crop_spec.rb b/spec/features/crops/creating_a_crop_spec.rb
index 9b542b822..6240db8d5 100644
--- a/spec/features/crops/creating_a_crop_spec.rb
+++ b/spec/features/crops/creating_a_crop_spec.rb
@@ -7,14 +7,14 @@ describe "Crop", js: true do
       within "form#new_crop" do
         fill_in "crop_name", with: "Philippine flower"
         fill_in "en_wikipedia_url", with: "https://en.wikipedia.org/wiki/Jasminum_sambac"
-        click_button "add-sciname-row"
+        click_button class: "add-sciname-row"
         fill_in "sci_name[1]", with: "Jasminum sambac 1"
         fill_in "sci_name[2]", with: "Jasminum sambac 2"
         fill_in "alt_name[1]", with: "Sampaguita"
-        click_button "add-altname-row"
-        click_button "add-altname-row"
+        click_button class: "add-altname-row"
+        click_button class: "add-altname-row"
         fill_in "alt_name[2]", with: "Manol"
-        click_button "add-altname-row"
+        click_button class: "add-altname-row"
         fill_in "alt_name[3]", with: "Jazmin"
         fill_in "alt_name[4]", with: "Matsurika"
       end

From 4e9ba4f43885d0dacd9010c2f09ece1c22f075c0 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 20:50:57 +1200
Subject: [PATCH 010/142] Merge css class

---
 app/assets/stylesheets/_members.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/_members.scss b/app/assets/stylesheets/_members.scss
index 8884c1d14..513473fa5 100644
--- a/app/assets/stylesheets/_members.scss
+++ b/app/assets/stylesheets/_members.scss
@@ -43,10 +43,10 @@
 .member-location {
   font-size: small;
   font-style: italic;
-}
 
-.member-location a {
-  color: $brown;
+  a {
+    color: $brown;
+  }
 }
 
 .location-not-set {

From f16921d994095bc6e545fb433c940374df1d83f1 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 1 Sep 2019 21:22:59 +1200
Subject: [PATCH 011/142] Remove extra whitespace

---
 app/assets/stylesheets/_members.scss   | 1 -
 app/assets/stylesheets/_plantings.scss | 2 --
 app/assets/stylesheets/_posts.scss     | 1 -
 app/assets/stylesheets/_variables.scss | 1 -
 app/assets/stylesheets/overrides.scss  | 1 -
 5 files changed, 6 deletions(-)

diff --git a/app/assets/stylesheets/_members.scss b/app/assets/stylesheets/_members.scss
index 513473fa5..76cf5eaef 100644
--- a/app/assets/stylesheets/_members.scss
+++ b/app/assets/stylesheets/_members.scss
@@ -39,7 +39,6 @@
   }
 }
 
-
 .member-location {
   font-size: small;
   font-style: italic;
diff --git a/app/assets/stylesheets/_plantings.scss b/app/assets/stylesheets/_plantings.scss
index fadfb35a6..820fd1329 100755
--- a/app/assets/stylesheets/_plantings.scss
+++ b/app/assets/stylesheets/_plantings.scss
@@ -63,8 +63,6 @@
   }
 }
 
-
-
 .planting-facts {
   display: flex;
   flex-wrap: wrap;
diff --git a/app/assets/stylesheets/_posts.scss b/app/assets/stylesheets/_posts.scss
index 331c91e53..5eb8a4b77 100644
--- a/app/assets/stylesheets/_posts.scss
+++ b/app/assets/stylesheets/_posts.scss
@@ -1,4 +1,3 @@
-
 .post-actions {
   margin-bottom: 1rem;
 }
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
index 574753da5..21fdceac3 100644
--- a/app/assets/stylesheets/_variables.scss
+++ b/app/assets/stylesheets/_variables.scss
@@ -11,7 +11,6 @@ $orange: #ffa500;
 $yellow: #b2935c;
 $white: #fff;
 
-
 $body-bg: $beige;
 $text-color: $brown;
 $link-color: $green;
diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index e85a03eeb..b0afca110 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -153,7 +153,6 @@ footer {
 }
 
 // ensure footer is pushed to bottom of browser window
-
 #maincontainer {
   min-height: 80%;
 }

From 82e2b56b0d2c1fc4952981c7129a98ab5f8b8308 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 09:49:57 +0000
Subject: [PATCH 012/142] Bump faker from 2.2.0 to 2.2.1

Bumps [faker](https://github.com/faker-ruby/faker) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 035b15fe6..eb620c456 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,7 +187,7 @@ GEM
     factory_bot_rails (5.0.2)
       factory_bot (~> 5.0.2)
       railties (>= 4.2.0)
-    faker (2.2.0)
+    faker (2.2.1)
       i18n (>= 0.8)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)

From a866c1f991f5a4ec6f89ac21f84ddd1c3578aeac Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 09:56:33 +0000
Subject: [PATCH 013/142] Bump oj from 3.9.0 to 3.9.1

Bumps [oj](https://github.com/ohler55/oj) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index eb620c456..ca827a710 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -339,7 +339,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.9.0)
+    oj (3.9.1)
     omniauth (1.9.0)
       hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)

From 1ad256efa2517e16933930fe47c9517cd525be43 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 09:51:52 +0000
Subject: [PATCH 014/142] Bump csv_shaper from 1.3.0 to 1.3.1

Bumps [csv_shaper](https://github.com/paulspringett/csv_shaper) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/paulspringett/csv_shaper/releases)
- [Commits](https://github.com/paulspringett/csv_shaper/compare/v1.3.0...v1.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ca827a710..431d43676 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,7 +150,7 @@ GEM
       thor (~> 0.19.1)
       tins (~> 1.6)
     crass (1.0.4)
-    csv_shaper (1.3.0)
+    csv_shaper (1.3.1)
       activesupport (>= 3.0.0)
     dalli (2.7.10)
     database_cleaner (1.7.0)

From 6af25d2d63e82466c3e8c73db09e498cdc14843e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 09:51:04 +0000
Subject: [PATCH 015/142] Bump rubocop-rails from 2.3.1 to 2.3.2

Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.1...v2.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 431d43676..e84d9bc99 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -359,7 +359,7 @@ GEM
       rack
     orm_adapter (0.5.0)
     parallel (1.17.0)
-    parser (2.6.3.0)
+    parser (2.6.4.0)
       ast (~> 2.4.0)
     percy-capybara (4.0.2)
     pg (0.21.0)
@@ -464,7 +464,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.3.1)
+    rubocop-rails (2.3.2)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     rubocop-rspec (1.35.0)

From 64f2d208d4b189d48523cc31d5690b428cad3d02 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 09:54:40 +0000
Subject: [PATCH 016/142] Bump selenium-webdriver from 3.142.3 to 3.142.4

Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.3 to 3.142.4.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e84d9bc99..3fd0a36c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,7 +113,7 @@ GEM
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     chartkick (3.2.1)
-    childprocess (1.0.1)
+    childprocess (2.0.0)
       rake (< 13.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
@@ -500,8 +500,8 @@ GEM
       activemodel (>= 5)
       elasticsearch (>= 6)
       hashie
-    selenium-webdriver (3.142.3)
-      childprocess (>= 0.5, < 2.0)
+    selenium-webdriver (3.142.4)
+      childprocess (>= 0.5, < 3.0)
       rubyzip (~> 1.2, >= 1.2.2)
     sexp_processor (4.12.1)
     sidekiq (5.2.7)

From 95c7fa2d939983d613ef4ed9e0f53796f31da634 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 09:52:49 +0000
Subject: [PATCH 017/142] Bump sidekiq from 5.2.7 to 6.0.0

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3fd0a36c9..37a8dfdb8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -504,11 +504,11 @@ GEM
       childprocess (>= 0.5, < 3.0)
       rubyzip (~> 1.2, >= 1.2.2)
     sexp_processor (4.12.1)
-    sidekiq (5.2.7)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+    sidekiq (6.0.0)
+      connection_pool (>= 2.2.2)
+      rack (>= 2.0.0)
+      rack-protection (>= 2.0.0)
+      redis (>= 4.1.0)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)

From fedfd4fd08d31ed870f2ae7a8b61de33480bf93e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2019 08:18:47 +0000
Subject: [PATCH 018/142] Bump capybara from 3.28.0 to 3.29.0

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.28.0 to 3.29.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.28.0...3.29.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 37a8dfdb8..13d8af9d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,8 +57,8 @@ GEM
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     anima (0.3.1)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2)
@@ -94,7 +94,7 @@ GEM
       uniform_notifier (~> 1.11)
     byebug (11.0.1)
     cancancan (3.0.1)
-    capybara (3.28.0)
+    capybara (3.29.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -368,7 +368,7 @@ GEM
       moneta (~> 1.0.0)
     popper_js (1.14.5)
     procto (0.0.3)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     puma (4.1.0)
       nio4r (~> 2.0)
     rack (2.0.7)

From c7e4883332f3af54955b2fb764c97664da098d44 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 5 Sep 2019 12:04:32 +1200
Subject: [PATCH 019/142] Update README.md

---
 README.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 46dbdcb09..23f099983 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Growstuff
+# 🌱 Growstuff
 
 [![Build Status](https://travis-ci.org/Growstuff/growstuff.svg?branch=dev)](https://travis-ci.org/Growstuff/growstuff)
 [![Coverage Status](https://coveralls.io/repos/github/Growstuff/growstuff/badge.svg?branch=dev)](https://coveralls.io/github/Growstuff/growstuff?branch=dev)
@@ -8,10 +8,9 @@ Welcome to the Growstuff project.
 
 You can find our app at https://www.growstuff.org
 
-Growstuff is an open source/open data project to create a website for
-food gardeners.  We crowdsource information on what our members are
-growing and harvesting, aggregate it, and make it available as open data
-via our API.
+Growstuff is an open source/open data project for food gardeners.  We
+crowdsource information on what our members are growing and harvesting,
+aggregate it, and make it available as open data via our API.
 
 Growstuff was founded in 2012 and has been built by dozens of
 [contributors](CONTRIBUTORS.md).  We are an inclusive, welcoming project, and

From 43f35ac6df5d7a04c99d593459c6ec63b3a95086 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2019 08:46:36 +0000
Subject: [PATCH 020/142] Bump newrelic_rpm from 6.5.0.357 to 6.6.0.358

Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 6.5.0.357 to 6.6.0.358.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/compare/6.5.0.357...6.6.0.358)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 13d8af9d6..e9508ee74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -328,7 +328,7 @@ GEM
     multi_json (1.11.3)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    newrelic_rpm (6.5.0.357)
+    newrelic_rpm (6.6.0.358)
     nio4r (2.4.0)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)

From 012b8a4ec09e98eea487cf7d88addb8f6efa13c3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2019 09:28:40 +0000
Subject: [PATCH 021/142] Bump devise from 4.7.0 to 4.7.1

Bumps [devise](https://github.com/plataformatec/devise) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.0...v4.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e9508ee74..b14c6715b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -154,7 +154,7 @@ GEM
       activesupport (>= 3.0.0)
     dalli (2.7.10)
     database_cleaner (1.7.0)
-    devise (4.7.0)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)

From 413d759ce53f3323d13ebf36716ec3492d40eb6d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2019 12:25:57 +0000
Subject: [PATCH 022/142] Bump faker from 2.2.1 to 2.2.2

Bumps [faker](https://github.com/faker-ruby/faker) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.1...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b14c6715b..23e61411a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,8 +187,8 @@ GEM
     factory_bot_rails (5.0.2)
       factory_bot (~> 5.0.2)
       railties (>= 4.2.0)
-    faker (2.2.1)
-      i18n (>= 0.8)
+    faker (2.2.2)
+      i18n (~> 1.6.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)

From 64066e1556662c502a2040c0086a15d3c2018bf2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2019 08:36:24 +0000
Subject: [PATCH 023/142] Bump scout_apm from 2.5.2 to 2.6.0

Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.5.2...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 23e61411a..bbe84ea12 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -495,7 +495,8 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (2.5.2)
+    scout_apm (2.6.0)
+      parser
     searchkick (4.1.0)
       activemodel (>= 5)
       elasticsearch (>= 6)

From 8fae9a225b8e929cd41de7c6fd5683788a5e698a Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 14 Sep 2019 11:26:49 +1200
Subject: [PATCH 024/142] Comment out chromium

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 076b53675..3e8bc2f13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ cache:
 addons:
   apt:
     packages:
-      - chromium-chromedriver
+      # - chromium-chromedriver
       - google-chrome-stable
       # Postgresql version used here should match production
       - postgresql-9.4

From 1c192bd51d649bca7bb4535cf6c60e42a391376e Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 14 Sep 2019 22:43:19 +1200
Subject: [PATCH 025/142] Fixing apt install errors on travis runs (#2171)

---
 .travis.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3e8bc2f13..63706e849 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,6 @@ cache:
 addons:
   apt:
     packages:
-      # - chromium-chromedriver
-      - google-chrome-stable
       # Postgresql version used here should match production
       - postgresql-9.4
       - postgresql-client-9.4
@@ -18,7 +16,7 @@ addons:
       secure: "PfhLGBKRgNqhKuYCJsK+VPhdAzcgWFGeeOyxC/eS8gtlvIISVdgyZE+r30uIei0DFI6zEiN62eW4d+xtT4j7/e2ZcAcx7U52mza/SnQNuu3nCGQDJB8VOvV5NbnwXfi8vfr4e889Mt7k3ocd2c4gqB4UtRqrzhygj7HN+B/GfEk="
 env:
   matrix:
-    - GROWSTUFF_ELASTICSEARCH=true RSPEC_TAG=elasticsearch COVERAGE=true
+    - GROWSTUFF_ELASTICSEARCH=true RSPEC_TAG=elasticsearch COVERAGE=true ELASTIC_SEARCH_VERSION="6.2.3"
     - GROWSTUFF_ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false
     - STATIC_CHECKS=true PERCY_CHECKS=true
   global:
@@ -27,9 +25,13 @@ env:
     - GROWSTUFF_SITE_NAME="Growstuff (travis)"
     - RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 before_install:
+  - sudo apt clean
+  # - sudo apt update
+  - sudo apt install dpkg
+  - sudo apt install google-chrome-stable
   - ./script/install_codeclimate.sh
   - ./script/install_linters.sh
-  - ELASTIC_SEARCH_VERSION="6.2.3" ./script/install_elasticsearch.sh
+  - ./script/install_elasticsearch.sh
 before_script:
   - >
     if [ "${COVERAGE}" = "true" ]; then

From 835f831e263ac52b7a5ee064d5134dcd69904333 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2019 08:37:43 +0000
Subject: [PATCH 026/142] Bump puma from 4.1.0 to 4.1.1

Bumps [puma](https://github.com/puma/puma) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bbe84ea12..650682676 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -329,7 +329,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     newrelic_rpm (6.6.0.358)
-    nio4r (2.4.0)
+    nio4r (2.5.1)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     oauth (0.5.4)
@@ -369,7 +369,7 @@ GEM
     popper_js (1.14.5)
     procto (0.0.3)
     public_suffix (4.0.1)
-    puma (4.1.0)
+    puma (4.1.1)
       nio4r (~> 2.0)
     rack (2.0.7)
     rack-protection (2.0.7)

From c19bf8ea72ca702d2a5c117818c2e1314557c25c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 14 Sep 2019 10:45:54 +0000
Subject: [PATCH 027/142] Bump faker from 2.2.2 to 2.3.0

Bumps [faker](https://github.com/faker-ruby/faker) from 2.2.2 to 2.3.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.2...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 650682676..8a21a5009 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,7 +187,7 @@ GEM
     factory_bot_rails (5.0.2)
       factory_bot (~> 5.0.2)
       railties (>= 4.2.0)
-    faker (2.2.2)
+    faker (2.3.0)
       i18n (~> 1.6.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)

From 2fc34bf6129619b46e41837585e6c7bb03aae6d2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2019 09:32:50 +0000
Subject: [PATCH 028/142] Bump faker from 2.3.0 to 2.4.0

Bumps [faker](https://github.com/faker-ruby/faker) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.3.0...v2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8a21a5009..f0b6f0d02 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,7 +187,7 @@ GEM
     factory_bot_rails (5.0.2)
       factory_bot (~> 5.0.2)
       railties (>= 4.2.0)
-    faker (2.3.0)
+    faker (2.4.0)
       i18n (~> 1.6.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)

From 9e216e3ae9afe7358ce3212420ca267c9c18ef9d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2019 09:57:37 +0000
Subject: [PATCH 029/142] Bump font-awesome-sass from 5.9.0 to 5.10.2

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.9.0 to 5.10.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.9.0...5.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f0b6f0d02..723fa6e31 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
     figaro (1.1.1)
       thor (~> 0.14)
     flickraw (0.9.10)
-    font-awesome-sass (5.9.0)
+    font-awesome-sass (5.10.2)
       sassc (>= 1.11)
     friendly_id (5.2.5)
       activerecord (>= 4.0.0)
@@ -486,9 +486,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.0.1)
+    sassc (2.2.1)
       ffi (~> 1.9)
-      rake
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)

From b7321ed46f636be317ce89835c009ff308007e37 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 20 Sep 2019 22:07:14 +1200
Subject: [PATCH 030/142] Add source to photos

---
 app/assets/stylesheets/_crops.scss            | 31 +++++++++++++++++
 app/controllers/photos_controller.rb          | 33 +++++++------------
 app/models/photo.rb                           |  6 +++-
 app/views/crops/_tiny.html.haml               |  6 ++++
 app/views/photos/_card.html.haml              |  2 +-
 app/views/photos/new.html.haml                |  9 ++---
 app/views/photos/show.html.haml               | 32 +++++++++---------
 db/migrate/20190910022329_add_photo_source.rb |  7 ++++
 spec/controllers/photos_controller_spec.rb    | 25 +++++++-------
 spec/factories/photos.rb                      |  3 +-
 10 files changed, 95 insertions(+), 59 deletions(-)
 create mode 100644 app/views/crops/_tiny.html.haml
 create mode 100644 db/migrate/20190910022329_add_photo_source.rb

diff --git a/app/assets/stylesheets/_crops.scss b/app/assets/stylesheets/_crops.scss
index 8c05b9652..d56530bb5 100644
--- a/app/assets/stylesheets/_crops.scss
+++ b/app/assets/stylesheets/_crops.scss
@@ -1,3 +1,7 @@
+.crop-icon {
+  height: 1em;
+}
+
 .planting {
   .crop-card {
     height: 100%;
@@ -30,3 +34,30 @@
 .remove-altname-row {
   display: none;
 }
+
+.crop-chip {
+  background-color: lighten($green, 20%);
+  border-radius: 25px;
+  display: inline-block;
+  font-size: 1em;
+  height: 30px;
+  line-height: 30px;
+  margin: .2em;
+  padding: 0 25px;
+
+  a {
+    color: $white;
+  }
+
+  img {
+    border-radius: 50%;
+    float: left;
+    height: 30px;
+    margin: 0 10px 0 -25px;
+    width: 30px;
+  }
+}
+
+.crop-hero-photo {
+  max-height: 300px;
+}
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index fe3f84d02..c8908801e 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -29,8 +29,8 @@ class PhotosController < ApplicationController
   def new
     @photo = Photo.new
     @item = item_to_link_to
-    @type = item_type
-    @id = item_id
+    @type = params[:type]
+    @id = params[:id]
     retrieve_from_flickr
     respond_with @photo
   end
@@ -63,31 +63,17 @@ class PhotosController < ApplicationController
 
   private
 
-  #
-  # Params
-  def item_id
-    params[:id]
-  end
-
-  def item_type
-    params[:type]
-  end
-
-  def flickr_photo_id_param
-    params[:photo][:flickr_photo_id]
-  end
-
   def photo_params
-    params.require(:photo).permit(:flickr_photo_id, :title, :license_name,
+    params.require(:photo).permit(:source_id, :source, :title, :license_name,
       :license_url, :thumbnail_url, :fullsize_url, :link_url)
   end
 
   # Item with photos attached
   def item_to_link_to
-    raise "No item id provided" if item_id.nil?
-    raise "No item type provided" if item_type.nil?
+    raise "No item id provided" if params[:id].nil?
+    raise "No item type provided" if params[:type].nil?
 
-    item_class = item_type.capitalize
+    item_class = params[:type].capitalize
     raise "Photos not supported" unless Photo::PHOTO_CAPABLE.include? item_class
 
     item_class.constantize.find(params[:id])
@@ -96,8 +82,11 @@ class PhotosController < ApplicationController
   #
   # Flickr retrieval
   def find_or_create_photo_from_flickr_photo
-    photo = Photo.find_by(flickr_photo_id: flickr_photo_id_param)
-    photo ||= Photo.new(photo_params)
+    photo = Photo.find_or_initialize_by(
+      source_id: photo_params[:source_id],
+      source:    'flickr'
+    )
+    photo.update(photo_params)
     photo.owner_id = current_member.id
     photo.set_flickr_metadata!
     photo
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 8ed9c2f57..a2f80e858 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -24,7 +24,7 @@ class Photo < ApplicationRecord
   # for easier stubbing and testing.
   def flickr_metadata
     flickr = owner.flickr
-    info = flickr.photos.getInfo(photo_id: flickr_photo_id)
+    info = flickr.photos.getInfo(photo_id: source_id)
     licenses = flickr.photos.licenses.getInfo
     license = licenses.find { |l| l.id == info.license }
     {
@@ -63,4 +63,8 @@ class Photo < ApplicationRecord
   def to_s
     "#{title} by #{owner.login_name}"
   end
+
+  def flickr_photo_id
+    source_id if source == 'flickr'
+  end
 end
diff --git a/app/views/crops/_tiny.html.haml b/app/views/crops/_tiny.html.haml
new file mode 100644
index 000000000..4e18c5871
--- /dev/null
+++ b/app/views/crops/_tiny.html.haml
@@ -0,0 +1,6 @@
+- if crop.approved? || can?(:wrangle, Crop)
+  .crop-chip
+    = link_to crop do
+      = crop.name
+    - unless crop.approved?
+      %badge.badge-warning= crop.approval_status
diff --git a/app/views/photos/_card.html.haml b/app/views/photos/_card.html.haml
index 0d17281f5..d16324610 100644
--- a/app/views/photos/_card.html.haml
+++ b/app/views/photos/_card.html.haml
@@ -1,5 +1,5 @@
 .card.photo-card{id: "photo-#{photo.id}"}
-  = link_to image_tag(photo.fullsize_url, alt: photo.title, class: 'img img-card'), photo
+  = link_to image_tag(photo.source == 'flickr' ? photo.fullsize_url : photo.thumbnail_url, alt: photo.title, class: 'img img-card'), photo
   .card-body
     %h5.ellipsis= link_to photo.title, photo
     %i by #{link_to photo.owner, photo.owner}
diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
index 9daefaac3..e60e4fd78 100644
--- a/app/views/photos/new.html.haml
+++ b/app/views/photos/new.html.haml
@@ -30,12 +30,9 @@
     - @photos.each do |photo|
       .col-md-2.col-6
         .card
-          = link_to image_tag(FlickRaw.url_z(photo), alt: '', class: 'img img-card',
-            width: 150, height: 150),
-            photos_path(photo: { flickr_photo_id: photo.id }, type: @type, id: @id),
-            method: :post
-          .card-body
-            %p.photo-title= photo.title
+          = link_to photos_path(photo: { source_id: photo.id, source: 'flickr' }, id: @id, type: @type ), method: :post do
+            = image_tag(FlickRaw.url_z(photo), alt: photo.title, class: 'img img-card')
+          .card-body= photo.title
 
   .row.pagination
     .col-md-12= will_paginate @photos
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index ea309fe42..091cff657 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -12,27 +12,28 @@
   %li.breadcrumb-item.active= link_to @photo, @photo
 
 .row{id: "photo-#{@photo.id}"}
-  .col-md-8
-    %h1.text-center.ellipsis=@photo.title
+  .col-md-9
+    %h1.text-center.ellipsis
+      = photo_icon
+      = @photo.title
     %p.text-center
-      = image_tag(@photo.fullsize_url, alt: @photo.title, class: 'rounded img-fluid shadow-sm')
-  .col-md-4
-
+      = image_tag(@photo.fullsize_url, alt: @photo.title, class: 'rounded img-responsive shadow-sm')
+  .col-md-3
     %p
       = render 'photos/actions', photo: @photo
-      = link_to "View on Flickr", @photo.link_url, class: 'btn'
+      = link_to @photo.link_url, class: 'btn btn-info' do
+        - if @photo.source == 'flickr'
+          = icon 'fab', 'flickr'
+        View on #{@photo.source}
       %span.btn= render 'photos/likes', photo: @photo
 
-
     - if @crops.size.positive?
-      .index-cards
-        - @crops.each do |crop|
-          = render 'crops/thumbnail', crop: crop
+      - @crops.each do |crop|
+        = render 'crops/tiny', crop: crop
     %p
-      = photo_icon
-      %strong Photo by
-      = link_to @photo.owner, @photo.owner
-      Taken on #{@photo.date_taken}
+      = render 'members/tiny', member: @photo.owner
+      - if @photo.date_taken.present?
+        Taken on #{I18n.l @photo.date_taken.to_date}
     %p
       %strong License:
       - if @photo.license_url
@@ -40,5 +41,4 @@
       - else
         = @photo.license_name
 
-    - if @photo.associations?
-      = render "associations", photo: @photo
\ No newline at end of file
+    = render "associations", photo: @photo
\ No newline at end of file
diff --git a/db/migrate/20190910022329_add_photo_source.rb b/db/migrate/20190910022329_add_photo_source.rb
new file mode 100644
index 000000000..461329cc8
--- /dev/null
+++ b/db/migrate/20190910022329_add_photo_source.rb
@@ -0,0 +1,7 @@
+class AddPhotoSource < ActiveRecord::Migration[5.2]
+  def change
+    add_column :photos, :source, :string
+    rename_column :photos, :flickr_photo_id, :source_id
+    Photo.update_all(source: 'flickr')
+  end
+end
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index c2848f528..d856939cc 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -90,7 +90,7 @@ describe PhotosController do
 
       it "attaches the photo to a planting" do
         post :create, params: {
-          photo: { flickr_photo_id: photo.flickr_photo_id },
+          photo: { source_id: photo.source_id, source: 'flickr' },
           type: "planting", id: planting.id
         }
         expect(flash[:alert]).not_to be_present
@@ -100,10 +100,10 @@ describe PhotosController do
       describe "doesn't attach a photo to a planting twice" do
         before do
           post :create, params: {
-            photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
+            photo: { source_id: photo.source_id, source: 'flickr' }, type: "planting", id: planting.id
           }
           post :create, params: {
-            photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
+            photo: { source_id: photo.source_id, source: 'flickr' }, type: "planting", id: planting.id
           }
         end
 
@@ -112,17 +112,17 @@ describe PhotosController do
       end
 
       it "attaches the photo to a harvest" do
-        post :create, params: { photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: harvest.id }
+        post :create, params: { photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: harvest.id }
         expect(flash[:alert]).not_to be_present
         Photo.last.harvests.first.should eq harvest
       end
 
       it "doesn't attach a photo to a harvest twice" do
         post :create, params: {
-          photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: harvest.id
+          photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: harvest.id
         }
         post :create, params: {
-          photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: harvest.id
+          photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: harvest.id
         }
         expect(flash[:alert]).not_to be_present
         Photo.last.harvests.size.should eq 1
@@ -132,7 +132,7 @@ describe PhotosController do
         comment = FactoryBot.create(:comment)
         expect do
           post :create, params: {
-            photo: { flickr_photo_id: photo.flickr_photo_id }, type: "comment", id: comment.id
+            photo: { source_id: photo.source_id, source: 'flickr' }, type: "comment", id: comment.id
           }
         end.to raise_error
       end
@@ -140,7 +140,7 @@ describe PhotosController do
 
     describe "for the second time" do
       let(:planting) { FactoryBot.create :planting, owner: member }
-      let(:valid_params) { { photo: { flickr_photo_id: 1 }, id: planting.id, type: 'planting' } }
+      let(:valid_params) { { photo: { source_id: 1 }, id: planting.id, type: 'planting' } }
 
       it "does not add a photo twice" do
         expect { post :create, params: valid_params }.to change(Photo, :count).by(1)
@@ -154,14 +154,14 @@ describe PhotosController do
       it "creates the planting/photo link" do
         planting = FactoryBot.create(:planting, garden: garden, owner: member)
         photo = FactoryBot.create(:photo, owner: member)
-        post :create, params: { photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id }
+        post :create, params: { photo: { source_id: photo.source_id, source: 'flickr' }, type: "planting", id: planting.id }
         expect(flash[:alert]).not_to be_present
         expect(Photo.last.plantings.first).to eq planting
       end
 
       describe "creates the harvest/photo link" do
         before do
-          post :create, params: { photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: harvest.id }
+          post :create, params: { photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: harvest.id }
         end
 
         it { expect(flash[:alert]).not_to be_present }
@@ -177,7 +177,8 @@ describe PhotosController do
         another_planting = FactoryBot.create(:planting)
         expect do
           post :create, params: {
-            photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: another_planting.id
+            photo: { source_id: photo.source_id, source: 'flickr' },
+            type: "planting", id: another_planting.id
           }
         end.to raise_error(ActiveRecord::RecordInvalid)
         Photo.last.plantings.first.should_not eq another_planting
@@ -188,7 +189,7 @@ describe PhotosController do
         another_harvest = FactoryBot.create(:harvest)
         expect do
           post :create, params: {
-            photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: another_harvest.id
+            photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: another_harvest.id
           }
         end.to raise_error(ActiveRecord::RecordInvalid)
         Photo.last.harvests.first.should_not eq another_harvest
diff --git a/spec/factories/photos.rb b/spec/factories/photos.rb
index b0a64331e..98625bde7 100644
--- a/spec/factories/photos.rb
+++ b/spec/factories/photos.rb
@@ -3,7 +3,8 @@
 FactoryBot.define do
   factory :photo do
     owner
-    flickr_photo_id { 1 }
+    source { 'flickr' }
+    source_id { 1 }
     title { Faker::Movies::HarryPotter.quote }
     license_name { "CC-BY" }
     license_url { "http://example.com/license.html" }

From 367377088b7b8ac81bac3f737f3cc9e9e15fc8a6 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 21 Sep 2019 09:37:55 +1200
Subject: [PATCH 031/142] Fix specs for photo sources

---
 app/views/photos/show.html.haml          | 2 +-
 spec/views/photos/show.html.haml_spec.rb | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 091cff657..67f2da1a6 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -24,7 +24,7 @@
       = link_to @photo.link_url, class: 'btn btn-info' do
         - if @photo.source == 'flickr'
           = icon 'fab', 'flickr'
-        View on #{@photo.source}
+        View on #{@photo.source.titleize}
       %span.btn= render 'photos/likes', photo: @photo
 
     - if @crops.size.positive?
diff --git a/spec/views/photos/show.html.haml_spec.rb b/spec/views/photos/show.html.haml_spec.rb
index a4a275751..f0f1235ef 100644
--- a/spec/views/photos/show.html.haml_spec.rb
+++ b/spec/views/photos/show.html.haml_spec.rb
@@ -21,22 +21,25 @@ describe "photos/show" do
     end
 
     it "links to the owner's profile" do
-      assert_select "a", href: @photo.owner
+      expect(rendered).to have_link(href: member_path(@photo.owner))
     end
 
     it "shows a link to the original image" do
-      assert_select "a", href: @photo.link_url, text: "View on Flickr"
+      expect(rendered).to have_link 'View on Flickr', href: @photo.link_url
     end
 
     it "links to harvest" do
       assert_select "a", href: harvest_path(harvest)
     end
+
     it "links to planting" do
       assert_select "a", href: planting_path(planting)
     end
+
     it "links to garden" do
       assert_select "a", href: garden_path(garden)
     end
+
     it "links to seeds" do
       assert_select "a", href: seed_path(seed)
     end

From 60ceef4fceb28201c14e1724f16cce2144943622 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 21 Sep 2019 09:43:36 +1200
Subject: [PATCH 032/142] Only show photo associations if we have any

---
 app/views/photos/_associations.html.haml | 57 ++++++++++++------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/app/views/photos/_associations.html.haml b/app/views/photos/_associations.html.haml
index 5e05c27e2..a6329848b 100644
--- a/app/views/photos/_associations.html.haml
+++ b/app/views/photos/_associations.html.haml
@@ -1,31 +1,32 @@
-%h4 This photo depicts:
-%p
-  %ul.associations
-    - @photo.posts.each do |post|
-      %li
-        = post_icon
-        = link_to post.subject, post
-        = render "association_delete_button", photo: @photo, type: 'post', thing: post
-    - @photo.plantings.each do |planting|
-      %li
-        = planting_icon
-        = link_to t('photos.show.planting', planting: planting.to_s, owner: planting.owner.to_s), planting_path(planting)
-        = render "association_delete_button", photo: @photo, type: 'planting', thing: planting
+- if @photo.associations.any?
+  %h4 This photo depicts:
+  %p
+    %ul.associations
+      - @photo.posts.each do |post|
+        %li
+          = post_icon
+          = link_to post.subject, post
+          = render "association_delete_button", photo: @photo, type: 'post', thing: post
+      - @photo.plantings.each do |planting|
+        %li
+          = planting_icon
+          = link_to t('photos.show.planting', planting: planting.to_s, owner: planting.owner.to_s), planting_path(planting)
+          = render "association_delete_button", photo: @photo, type: 'planting', thing: planting
 
-    - @photo.harvests.each do |harvest|
-      %li
-        = harvest_icon
-        = link_to t('photos.show.harvest', crop: harvest.crop.name, owner: harvest.owner.to_s), harvest_path(harvest)
-        = render "association_delete_button", photo: @photo, type: 'harvest', thing: harvest
+      - @photo.harvests.each do |harvest|
+        %li
+          = harvest_icon
+          = link_to t('photos.show.harvest', crop: harvest.crop.name, owner: harvest.owner.to_s), harvest_path(harvest)
+          = render "association_delete_button", photo: @photo, type: 'harvest', thing: harvest
 
-    - @photo.gardens.each do |garden|
-      %li
-        = garden_icon
-        = link_to t('photos.show.garden', garden: garden.to_s, owner: garden.owner.to_s), garden_path(garden)
-        = render "association_delete_button", photo: @photo, type: 'garden', thing: garden
+      - @photo.gardens.each do |garden|
+        %li
+          = garden_icon
+          = link_to t('photos.show.garden', garden: garden.to_s, owner: garden.owner.to_s), garden_path(garden)
+          = render "association_delete_button", photo: @photo, type: 'garden', thing: garden
 
-    - @photo.seeds.each do |seed|
-      %li
-        = seed_icon
-        = link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
-        = render "association_delete_button", photo: @photo, type: 'seed', thing: seed
+      - @photo.seeds.each do |seed|
+        %li
+          = seed_icon
+          = link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
+          = render "association_delete_button", photo: @photo, type: 'seed', thing: seed

From 87e1a7571bcda1ac151ca71f93792fc7f33bdc40 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 21 Sep 2019 09:45:34 +1200
Subject: [PATCH 033/142] Photo source in the schema

---
 db/schema.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 1ce9e5deb..9c42b7a59 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_07_21_042146) do
+ActiveRecord::Schema.define(version: 2019_09_15_065209) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -153,6 +153,11 @@ ActiveRecord::Schema.define(version: 2019_07_21_042146) do
     t.datetime "updated_at"
   end
 
+  create_table "crop_companions", force: :cascade do |t|
+    t.integer "crop_a_id", null: false
+    t.integer "crop_b_id", null: false
+  end
+
   create_table "crops", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.string "en_wikipedia_url"
@@ -416,9 +421,10 @@ ActiveRecord::Schema.define(version: 2019_07_21_042146) do
     t.string "license_name", null: false
     t.string "license_url"
     t.string "link_url", null: false
-    t.string "flickr_photo_id"
+    t.string "source_id"
     t.datetime "date_taken"
     t.integer "likes_count", default: 0
+    t.string "source"
   end
 
   create_table "photos_plantings", id: false, force: :cascade do |t|

From 5fab14dc8a54fd30d779bc5715407753f9ebbb19 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 21 Sep 2019 10:28:52 +1200
Subject: [PATCH 034/142] Fixed associations view

---
 app/views/photos/_associations.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/photos/_associations.html.haml b/app/views/photos/_associations.html.haml
index a6329848b..f036c0851 100644
--- a/app/views/photos/_associations.html.haml
+++ b/app/views/photos/_associations.html.haml
@@ -1,4 +1,4 @@
-- if @photo.associations.any?
+- if @photo.associations?
   %h4 This photo depicts:
   %p
     %ul.associations

From 90035e79b8d1eb9c3334c16734ffcd298af4b9f1 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 22 Sep 2019 10:06:53 +1200
Subject: [PATCH 035/142] Crop to post relationship made more rails standard

---
 app/models/crop.rb                      |  7 ++-----
 app/models/crop_post.rb                 |  4 ++++
 app/models/post.rb                      | 18 ++++++++----------
 db/migrate/20190921211652_crop_posts.rb |  5 +++++
 db/schema.rb                            | 16 ++++++++--------
 5 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 app/models/crop_post.rb
 create mode 100644 db/migrate/20190921211652_crop_posts.rb

diff --git a/app/models/crop.rb b/app/models/crop.rb
index e0166744d..b639ed9d7 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -3,10 +3,6 @@ class Crop < ApplicationRecord
   include PhotoCapable
   friendly_id :name, use: %i(slugged finders)
 
-  ##
-  ## Triggers
-  before_destroy { |crop| crop.posts.clear }
-
   ##
   ## Relationships
   has_many :scientific_names, dependent: :destroy
@@ -22,7 +18,8 @@ class Crop < ApplicationRecord
   belongs_to :requester, class_name: 'Member', optional: true, inverse_of: :requested_crops
   belongs_to :parent, class_name: 'Crop', optional: true, inverse_of: :varieties
   has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id', dependent: :nullify, inverse_of: :parent
-  has_and_belongs_to_many :posts # rubocop:disable Rails/HasAndBelongsToMany
+  has_many :crop_posts
+  has_many :posts, through: :crop_posts, dependent: :delete_all
 
   ##
   ## Scopes
diff --git a/app/models/crop_post.rb b/app/models/crop_post.rb
new file mode 100644
index 000000000..8aaa15214
--- /dev/null
+++ b/app/models/crop_post.rb
@@ -0,0 +1,4 @@
+class CropPost < ApplicationRecord
+  belongs_to :crop
+  belongs_to :post
+end
\ No newline at end of file
diff --git a/app/models/post.rb b/app/models/post.rb
index 685ffee19..c706fb18f 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -9,14 +9,12 @@ class Post < ApplicationRecord
   belongs_to :author, class_name: 'Member', inverse_of: :posts
   belongs_to :forum, optional: true
   has_many :comments, dependent: :destroy
-  has_and_belongs_to_many :crops # rubocop:disable Rails/HasAndBelongsToMany
-  # also has_many notifications, but kinda meaningless to get at them
-  # from this direction, so we won't set up an association for now.
+  has_many :crop_posts, dependent: :delete_all
+  has_many :crops, through: :crop_posts
 
   #
   # Triggers
-  before_destroy { |post| post.crops.clear }
-  after_save :update_crops_posts_association
+  after_save :update_crop_posts_association
   after_create  :send_notification
 
   default_scope { joins(:author).merge(Member.kept) } # Ensures the owner still exists
@@ -59,14 +57,14 @@ class Post < ApplicationRecord
 
   private
 
-  def update_crops_posts_association
-    crops.destroy_all
+  def update_crop_posts_association
+    crops.clear
     # look for crops mentioned in the post. eg. [tomato](crop)
     body.scan(Haml::Filters::GrowstuffMarkdown::CROP_REGEX) do |_m|
-      # find crop case-insensitively
-      crop = Crop.case_insensitive_name(Regexp.last_match(1)).first
+      crop_name = Regexp.last_match(1)
+      crop = Crop.case_insensitive_name(crop_name).first
       # create association
-      crops << crop if crop && !crops.include?(crop)
+      self.crops << crop if crop && !crops.include?(crop)
     end
   end
 
diff --git a/db/migrate/20190921211652_crop_posts.rb b/db/migrate/20190921211652_crop_posts.rb
new file mode 100644
index 000000000..c7f2950c5
--- /dev/null
+++ b/db/migrate/20190921211652_crop_posts.rb
@@ -0,0 +1,5 @@
+class CropPosts < ActiveRecord::Migration[5.2]
+  def change
+    rename_table :crops_posts, :crop_posts
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1ce9e5deb..eb762a0d0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_07_21_042146) do
+ActiveRecord::Schema.define(version: 2019_09_21_211652) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -153,6 +153,13 @@ ActiveRecord::Schema.define(version: 2019_07_21_042146) do
     t.datetime "updated_at"
   end
 
+  create_table "crop_posts", id: false, force: :cascade do |t|
+    t.integer "crop_id"
+    t.integer "post_id"
+    t.index ["crop_id", "post_id"], name: "index_crop_posts_on_crop_id_and_post_id"
+    t.index ["crop_id"], name: "index_crop_posts_on_crop_id"
+  end
+
   create_table "crops", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.string "en_wikipedia_url"
@@ -176,13 +183,6 @@ ActiveRecord::Schema.define(version: 2019_07_21_042146) do
     t.index ["slug"], name: "index_crops_on_slug", unique: true
   end
 
-  create_table "crops_posts", id: false, force: :cascade do |t|
-    t.integer "crop_id"
-    t.integer "post_id"
-    t.index ["crop_id", "post_id"], name: "index_crops_posts_on_crop_id_and_post_id"
-    t.index ["crop_id"], name: "index_crops_posts_on_crop_id"
-  end
-
   create_table "follows", id: :serial, force: :cascade do |t|
     t.integer "follower_id"
     t.integer "followed_id"

From fab9560c46c945092b539e05d8983f59faddba3e Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 22 Sep 2019 13:22:02 +1200
Subject: [PATCH 036/142] Apply suggestions from code review

---
 app/models/crop.rb      | 2 +-
 app/models/crop_post.rb | 2 +-
 app/models/post.rb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/crop.rb b/app/models/crop.rb
index b639ed9d7..857b8e132 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -18,7 +18,7 @@ class Crop < ApplicationRecord
   belongs_to :requester, class_name: 'Member', optional: true, inverse_of: :requested_crops
   belongs_to :parent, class_name: 'Crop', optional: true, inverse_of: :varieties
   has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id', dependent: :nullify, inverse_of: :parent
-  has_many :crop_posts
+  has_many :crop_posts, dependent: :delete_all
   has_many :posts, through: :crop_posts, dependent: :delete_all
 
   ##
diff --git a/app/models/crop_post.rb b/app/models/crop_post.rb
index 8aaa15214..5c520e3b6 100644
--- a/app/models/crop_post.rb
+++ b/app/models/crop_post.rb
@@ -1,4 +1,4 @@
 class CropPost < ApplicationRecord
   belongs_to :crop
   belongs_to :post
-end
\ No newline at end of file
+end
diff --git a/app/models/post.rb b/app/models/post.rb
index c706fb18f..b2a8b88fd 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -64,7 +64,7 @@ class Post < ApplicationRecord
       crop_name = Regexp.last_match(1)
       crop = Crop.case_insensitive_name(crop_name).first
       # create association
-      self.crops << crop if crop && !crops.include?(crop)
+      crops << crop if crop && !crops.include?(crop)
     end
   end
 

From 743d10e098d18cf3ade331ac40a0a579fa819958 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2019 10:01:36 +0000
Subject: [PATCH 037/142] Bump puma from 4.1.1 to 4.2.0

Bumps [puma](https://github.com/puma/puma) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 723fa6e31..c7522a043 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -369,7 +369,7 @@ GEM
     popper_js (1.14.5)
     procto (0.0.3)
     public_suffix (4.0.1)
-    puma (4.1.1)
+    puma (4.2.0)
       nio4r (~> 2.0)
     rack (2.0.7)
     rack-protection (2.0.7)

From 61bede6031d1a3900486b7427a702d9f5c0620a0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2019 10:04:05 +0000
Subject: [PATCH 038/142] Bump bootstrap_form from 4.2.0 to 4.3.0

Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases)
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c7522a043..726ea0691 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
     bootstrap-kaminari-views (0.0.5)
       kaminari (>= 0.13)
       rails (>= 3.1)
-    bootstrap_form (4.2.0)
+    bootstrap_form (4.3.0)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
     builder (3.2.3)
@@ -323,7 +323,7 @@ GEM
     mini_magick (4.9.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.12.0)
     moneta (1.0.0)
     multi_json (1.11.3)
     multi_xml (0.6.0)

From 17b468d440eb1d9861ac0da9e4128ac0d3720e6b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2019 09:50:10 +0000
Subject: [PATCH 039/142] Bump factory_bot_rails from 5.0.2 to 5.1.0

Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 726ea0691..7029ae895 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,10 +182,10 @@ GEM
     erubis (2.7.0)
     excon (0.64.0)
     execjs (2.7.0)
-    factory_bot (5.0.2)
+    factory_bot (5.1.0)
       activesupport (>= 4.2.0)
-    factory_bot_rails (5.0.2)
-      factory_bot (~> 5.0.2)
+    factory_bot_rails (5.1.0)
+      factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
     faker (2.4.0)
       i18n (~> 1.6.0)

From 758db158cb4106d1926509a8ded006351f23b05e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2019 09:35:34 +0000
Subject: [PATCH 040/142] Bump font-awesome-sass from 5.10.2 to 5.11.2

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.10.2 to 5.11.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.10.2...5.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7029ae895..c015705df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
     figaro (1.1.1)
       thor (~> 0.14)
     flickraw (0.9.10)
-    font-awesome-sass (5.10.2)
+    font-awesome-sass (5.11.2)
       sassc (>= 1.11)
     friendly_id (5.2.5)
       activerecord (>= 4.0.0)

From bcb2464b531bf7fd4a3631d7ef485b4761558636 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2019 09:34:45 +0000
Subject: [PATCH 041/142] Bump friendly_id from 5.2.5 to 5.3.0

Bumps [friendly_id](https://github.com/norman/friendly_id) from 5.2.5 to 5.3.0.
- [Release notes](https://github.com/norman/friendly_id/releases)
- [Changelog](https://github.com/norman/friendly_id/blob/master/Changelog.md)
- [Commits](https://github.com/norman/friendly_id/compare/5.2.5...5.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c015705df..9b5773e1e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
     flickraw (0.9.10)
     font-awesome-sass (5.11.2)
       sassc (>= 1.11)
-    friendly_id (5.2.5)
+    friendly_id (5.3.0)
       activerecord (>= 4.0.0)
     geocoder (1.4.9)
     gibbon (1.2.1)

From 50723532933e4fdc0bee1df35b330f09d1931a79 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 24 Sep 2019 14:56:40 +1200
Subject: [PATCH 042/142] Only save location (used for post-signin redirect) if
 this is a format html page

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 023603b33..e30fe25b1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -15,7 +15,7 @@ class ApplicationController < ActionController::Base
                              "/members/password/edit",
                              "/members/confirmation",
                              "/members/sign_out"]) || request.xhr?
-      store_location_for(:member, request.fullpath)
+      store_location_for(:member, request.fullpath) if request.format == :html
     end
   end
 

From 8dc56c48e2555e41e5913fcd3af3198424c175b4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2019 10:24:46 +0000
Subject: [PATCH 043/142] Bump scout_apm from 2.6.0 to 2.6.1

Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b5773e1e..b77a4b5c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -359,7 +359,7 @@ GEM
       rack
     orm_adapter (0.5.0)
     parallel (1.17.0)
-    parser (2.6.4.0)
+    parser (2.6.4.1)
       ast (~> 2.4.0)
     percy-capybara (4.0.2)
     pg (0.21.0)
@@ -494,7 +494,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (2.6.0)
+    scout_apm (2.6.1)
       parser
     searchkick (4.1.0)
       activemodel (>= 5)

From 719fec24d0fd7af2c79c3f3a6d2b69a6e6ea1ecd Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 21 Sep 2019 10:21:12 +1200
Subject: [PATCH 044/142] if someone is destroy, delete all likes

---
 app/models/concerns/likeable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/likeable.rb b/app/models/concerns/likeable.rb
index 4937af53e..9db3da6e5 100644
--- a/app/models/concerns/likeable.rb
+++ b/app/models/concerns/likeable.rb
@@ -2,7 +2,7 @@ module Likeable
   extend ActiveSupport::Concern
 
   included do
-    has_many :likes, as: :likeable, inverse_of: :likeable, dependent: :destroy
+    has_many :likes, as: :likeable, inverse_of: :likeable, dependent: :delete_all
     has_many :members, through: :likes
   end
 

From 99e2ca492061b982ced103f63e2507d1f007c5a2 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 21 Sep 2019 10:21:37 +1200
Subject: [PATCH 045/142] If a crop is deleted, delete association (gerund)
 records too

---
 app/models/crop.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/crop.rb b/app/models/crop.rb
index e0166744d..111756069 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -9,13 +9,13 @@ class Crop < ApplicationRecord
 
   ##
   ## Relationships
-  has_many :scientific_names, dependent: :destroy
+  has_many :scientific_names, dependent: :delete_all
   accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
-  has_many :alternate_names, dependent: :destroy
+  has_many :alternate_names, dependent: :delete_all
   has_many :plantings, dependent: :destroy
   has_many :seeds, dependent: :destroy
   has_many :harvests, dependent: :destroy
-  has_many :photo_associations, dependent: :destroy
+  has_many :photo_associations, dependent: :delete_all
   has_many :photos, through: :photo_associations
   has_many :plant_parts, -> { joins_members.distinct.order("plant_parts.name") }, through: :harvests
   belongs_to :creator, class_name: 'Member', optional: true, inverse_of: :created_crops

From 66a3b2c52b843d9f71daac9b389961cd48cb8feb Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 21 Sep 2019 10:21:54 +1200
Subject: [PATCH 046/142] If we delete a photo, delete the associations records

---
 app/models/concerns/photo_capable.rb | 2 +-
 app/models/photo.rb                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/concerns/photo_capable.rb b/app/models/concerns/photo_capable.rb
index dfddef42c..9cb440bd7 100644
--- a/app/models/concerns/photo_capable.rb
+++ b/app/models/concerns/photo_capable.rb
@@ -2,7 +2,7 @@ module PhotoCapable
   extend ActiveSupport::Concern
 
   included do
-    has_many :photo_associations, as: :photographable, dependent: :destroy, inverse_of: :photographable
+    has_many :photo_associations, as: :photographable, dependent: :delete_all, inverse_of: :photographable
     has_many :photos, through: :photo_associations, as: :photographable
 
     scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }
diff --git a/app/models/photo.rb b/app/models/photo.rb
index a2f80e858..304c43c6f 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -4,7 +4,7 @@ class Photo < ApplicationRecord
 
   PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post).freeze
 
-  has_many :photo_associations, foreign_key: :photo_id, dependent: :destroy, inverse_of: :photo
+  has_many :photo_associations, foreign_key: :photo_id, dependent: :delete_all, inverse_of: :photo
   has_many :crops, through: :photo_associations
 
   # creates a relationship for each assignee type

From e043199866f9199d1d9075348b0b75d71bf43946 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 26 Sep 2019 09:42:34 +0000
Subject: [PATCH 047/142] Bump uglifier from 4.1.20 to 4.2.0

Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.20 to 4.2.0.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b77a4b5c3..48d41f060 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -535,7 +535,7 @@ GEM
     trollop (1.16.2)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.20)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     unicorn (5.5.1)

From 6a4158ae043bc484871f9803532071cbb73622d6 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 28 Sep 2019 10:38:01 +1200
Subject: [PATCH 048/142] =?UTF-8?q?=F0=9F=91=AD=20Crop=20companions=20(#21?=
 =?UTF-8?q?76)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
---
 app/assets/stylesheets/_predictions.scss      |   2 +-
 app/models/crop.rb                            |   2 +
 app/models/crop_companion.rb                  |   4 +
 app/views/crops/show.html.haml                | 114 ++++++++++--------
 .../20190915065209_create_crop_companions.rb  |   9 ++
 db/schema.rb                                  |   7 ++
 spec/factories/crop_companions.rb             |   4 +
 spec/factories/photos.rb                      |   2 +-
 spec/features/crops/crop_detail_page_spec.rb  |  43 +++----
 spec/models/crop_companion_spec.rb            |   5 +
 10 files changed, 116 insertions(+), 76 deletions(-)
 create mode 100644 app/models/crop_companion.rb
 create mode 100644 db/migrate/20190915065209_create_crop_companions.rb
 create mode 100644 spec/factories/crop_companions.rb
 create mode 100644 spec/models/crop_companion_spec.rb

diff --git a/app/assets/stylesheets/_predictions.scss b/app/assets/stylesheets/_predictions.scss
index f16c6ee8f..18d1ac623 100644
--- a/app/assets/stylesheets/_predictions.scss
+++ b/app/assets/stylesheets/_predictions.scss
@@ -9,7 +9,7 @@
 
     strong {
       font-align: center;
-      font-size: 4em;
+      font-size: 3em;
     }
 
     span {
diff --git a/app/models/crop.rb b/app/models/crop.rb
index 7dc1ccf01..1c787c8f9 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -18,6 +18,8 @@ class Crop < ApplicationRecord
   belongs_to :requester, class_name: 'Member', optional: true, inverse_of: :requested_crops
   belongs_to :parent, class_name: 'Crop', optional: true, inverse_of: :varieties
   has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id', dependent: :nullify, inverse_of: :parent
+  has_many :crop_companions, foreign_key: :crop_a_id, inverse_of: :crop_a, dependent: :delete_all
+  has_many :companions, through: :crop_companions, source: :crop_b, class_name: 'Crop'
   has_many :crop_posts, dependent: :delete_all
   has_many :posts, through: :crop_posts, dependent: :delete_all
 
diff --git a/app/models/crop_companion.rb b/app/models/crop_companion.rb
new file mode 100644
index 000000000..55d7c27a1
--- /dev/null
+++ b/app/models/crop_companion.rb
@@ -0,0 +1,4 @@
+class CropCompanion < ApplicationRecord
+  belongs_to :crop_a, class_name: :Crop
+  belongs_to :crop_b, class_name: :Crop
+end
diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index e81ee11b1..131ab483a 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -1,7 +1,6 @@
 - content_for :title, @crop.name
 - content_for :opengraph do
-  - @crop.photos.each do |photo|
-    = tag("meta", property: "og:image", content: photo.fullsize_url)
+  = tag("meta", property: "og:image", content: crop_image_path(@crop))
   = tag("meta", property: "og:title", content: @crop.name)
   = tag("meta", property: "og:type", content: "website")
   = tag("meta", property: "og:url", content: request.original_url)
@@ -12,64 +11,73 @@
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Crops', crops_path
-  %li.breadcrumb-item.active= link_to @crop, @crop
-
-%h1
-  %strong= @crop.name.titleize
-  %small.text-muted= @crop.default_scientific_name
-%p= render 'crops/actions', crop: @crop
+  %li.breadcrumb-item.active= link_to @crop.name.capitalize, @crop
 
 = render 'approval_status_message', crop: @crop
+.jumbotron
+  .row
+    .col-md-9
+      %h1
+        %strong= @crop.name.capitalize
+        - unless @crop.approved?
+          %badge.badge-warning=@crop.approval_status
+        %small.text-muted= @crop.default_scientific_name
+      %p.text-muted
+        - if !@crop.plantings.empty?
+          #{@crop.name.capitalize} has been planted
+          = pluralize(@crop.plantings.size, "time")
+          by #{ENV['GROWSTUFF_SITE_NAME']} members.
+        - else
+          Nobody is growing this yet. You could be the first!
+    .col-md-3
+      = image_tag crop_image_path(@crop),
+        class: 'img-responsive shadow rounded crop-hero-photo', alt: 'photo of crop'
 
 .row
   .col-md-9
-    %p
-      - if !@crop.plantings.empty?
-        #{@crop.name.titleize} has been planted
-        = pluralize(@crop.plantings.size, "time")
-        by #{ENV['GROWSTUFF_SITE_NAME']} members.
-      - else
-        Nobody is growing this yet. You could be the first!
-      - if @crop.perennial?
-        #{@crop.name.capitalize} is a perennial crop (living more than two years)
-      - elsif @crop.annual?
-        #{@crop.name.capitalize} is an annual crop (living and reproducing in a single year or less)
-    %hr/
-
-    = render 'predictions', crop: @crop
-    %hr/
-    = render 'crops/photos', photos: @photos, crop: @crop
-
-    .card-deck.text-center
-      .col-md-4
-        %h3.section-heading.h3.pt-4 Sunniness
-        = pie_chart crop_sunniness_path(@crop, format: :json), legend: "bottom"
-      .col-md-4
-        %h3.section-heading.h3.pt-4 Planted from
-        = pie_chart crop_planted_from_path(@crop, format: :json), legend: "bottom"
-      .col-md-4
-        %h3.section-heading.h3.pt-4 Harvested for
-        = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
-
-    .varieties= render 'varieties', crop: @crop
-
-    %h3
-      = icon 'fas', 'map'
-      Crop Map
-    %p
-      Only plantings by members who have set their locations are shown on this map.
-      - if current_member && current_member.location.blank?
-        = link_to "Set your location.", edit_member_registration_path
-    #cropmap.map
-
-    = render 'crops/posts', crop: @crop
-
+    = render 'crops/actions', crop: @crop
   .col-md-3
     = render 'wrangle', crop: @crop
+
+.row
+  .col-md-9
+    %section.prediction= render 'predictions', crop: @crop
+    - if @crop.companions.any?
+      %section.companions
+        %h2 Companions
+        - @crop.companions.each do |companion|
+          = render 'crops/tiny', crop: companion
+
+    %section.photos= render 'crops/photos', photos: @photos, crop: @crop
+
+    - if @crop.plantings.any?
+      .card-deck.text-center
+        .col-md-4
+          %h3.section-heading.h3.pt-4 Sunniness
+          = pie_chart crop_sunniness_path(@crop, format: :json), legend: "bottom"
+        .col-md-4
+          %h3.section-heading.h3.pt-4 Planted from
+          = pie_chart crop_planted_from_path(@crop, format: :json), legend: "bottom"
+        .col-md-4
+          %h3.section-heading.h3.pt-4 Harvested for
+          = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
+
+    %section.varieties= render 'varieties', crop: @crop
+
+    %section.crop-map
+      %h2
+        = icon 'fas', 'map'
+        Crop Map
+      %p
+        Only plantings by members who have set their locations are shown on this map.
+        - if current_member && current_member.location.blank?
+          = link_to "Set your location.", edit_member_registration_path
+      #cropmap.map
+
+    %section.posts= render 'crops/posts', crop: @crop
+
+  .col-md-3
     .card
-      .crop-image
-        = image_tag crop_image_path(@crop, full_size: true),
-          class: 'img-card', alt: 'photo of crop'
       .card-body
         %h4 How to grow #{@crop.name.pluralize}
         = render 'grown_for', crop: @crop
@@ -123,7 +131,7 @@
             Wikipedia (English)
 
         %li.list-group-item
-          = link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name}",
+          = link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-')}",
                     class: 'card-link',
                     target: "_blank",
                     rel: "noopener noreferrer" do
diff --git a/db/migrate/20190915065209_create_crop_companions.rb b/db/migrate/20190915065209_create_crop_companions.rb
new file mode 100644
index 000000000..1b9d1b974
--- /dev/null
+++ b/db/migrate/20190915065209_create_crop_companions.rb
@@ -0,0 +1,9 @@
+class CreateCropCompanions < ActiveRecord::Migration[5.2]
+  def change
+    create_table :crop_companions do |t|
+      t.integer "crop_a_id", null: false
+      t.integer "crop_b_id", null: false
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e5726871f..4a450b704 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -153,6 +153,13 @@ ActiveRecord::Schema.define(version: 2019_09_21_211652) do
     t.datetime "updated_at"
   end
 
+  create_table "crop_companions", force: :cascade do |t|
+    t.integer "crop_a_id", null: false
+    t.integer "crop_b_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "crop_posts", id: false, force: :cascade do |t|
     t.integer "crop_id"
     t.integer "post_id"
diff --git a/spec/factories/crop_companions.rb b/spec/factories/crop_companions.rb
new file mode 100644
index 000000000..6db4f0eb0
--- /dev/null
+++ b/spec/factories/crop_companions.rb
@@ -0,0 +1,4 @@
+FactoryBot.define do
+  factory :crop_companion do
+  end
+end
diff --git a/spec/factories/photos.rb b/spec/factories/photos.rb
index 98625bde7..41e581d29 100644
--- a/spec/factories/photos.rb
+++ b/spec/factories/photos.rb
@@ -14,7 +14,7 @@ FactoryBot.define do
 
     factory :unlicensed_photo do
       license_name { "All rights reserved" }
-      license_url { "" }
+      license_url { nil }
     end
   end
 end
diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb
index 3d1449a1d..057226c4a 100644
--- a/spec/features/crops/crop_detail_page_spec.rb
+++ b/spec/features/crops/crop_detail_page_spec.rb
@@ -61,8 +61,7 @@ describe "crop detail page", js: true do
       end
 
       it "has a link to OpenFarm" do
-        expect(page).to have_link "OpenFarm - Growing guide",
-                                  href: "https://openfarm.cc/en/crops/#{CGI.escape crop.name}"
+        expect(page).to have_link "OpenFarm - Growing guide"
       end
 
       it "has a link to gardenate" do
@@ -123,7 +122,7 @@ describe "crop detail page", js: true do
                                    finished_at: 1.day.ago)
     end
 
-    context 'crop is an annual' do
+    context 'crop is an Annual' do
       let(:crop) { FactoryBot.create(:annual_crop) }
 
       describe 'with no harvests' do
@@ -138,14 +137,13 @@ describe "crop detail page", js: true do
         expect(subject).to have_text "99 days"
       end
 
-      it "describes annual crops" do
-        expect(subject).to have_text(
-          "#{crop.name.capitalize} is an annual crop (living and reproducing in a single year or less)"
-        )
+      it "describes Annual crops" do
+        expect(subject).to have_text("living and reproducing in a single year or less")
+        expect(subject).to have_text('Annual')
       end
     end
 
-    context 'crop is perennial' do
+    context 'crop is Perennial' do
       let(:crop) { FactoryBot.create :perennial_crop }
 
       describe 'with no harvests' do
@@ -155,12 +153,13 @@ describe "crop detail page", js: true do
         include_examples "predicts harvest"
       end
 
-      it "describes perennial crops" do
-        expect(subject).to have_text("#{crop.name.capitalize} is a perennial crop (living more than two years)")
+      it "describes Perennial crops" do
+        expect(subject).to have_text("Perennial")
+        expect(subject).to have_text("living more than two years")
       end
     end
 
-    context 'crop perennial value is null' do
+    context 'crop Perennial value is null' do
       let(:crop) { FactoryBot.create :crop, perennial: nil }
 
       describe 'with no harvests' do
@@ -172,28 +171,30 @@ describe "crop detail page", js: true do
     end
   end
 
-  context 'annual and perennial' do
+  context 'Annual and Perennial' do
     before { visit crop_path(crop) }
 
-    context 'crop is an annual' do
+    context 'crop is an Annual' do
       let(:crop) { FactoryBot.create :annual_crop }
 
-      it { expect(page).to have_text 'annual crop (living and reproducing in a single year or less)' }
-      it { expect(page).not_to have_text 'perennial crop (living more than two years)' }
+      it { expect(page).to have_text 'Annual' }
+      it { expect(page).to have_text 'living and reproducing in a single year or less' }
+      it { expect(page).not_to have_text 'Perennial' }
     end
 
-    context 'crop is perennial' do
+    context 'crop is Perennial' do
       let(:crop) { FactoryBot.create :perennial_crop }
 
-      it { expect(page).to have_text 'perennial crop (living more than two years)' }
-      it { expect(page).not_to have_text 'annual crop (living and reproducing in a single year or less)' }
+      it { expect(page).to have_text 'Perennial' }
+      it { expect(page).to have_text 'living more than two years' }
+      it { expect(page).not_to have_text 'Annual' }
     end
 
-    context 'crop perennial value is null' do
+    context 'crop Perennial value is null' do
       let(:crop) { FactoryBot.create :crop, perennial: nil }
 
-      it { expect(page).not_to have_text 'perennial crop (living more than two years)' }
-      it { expect(page).not_to have_text 'annual crop (living and reproducing in a single year or less)' }
+      it { expect(page).not_to have_text 'Perennial' }
+      it { expect(page).not_to have_text 'Annual' }
     end
   end
 end
diff --git a/spec/models/crop_companion_spec.rb b/spec/models/crop_companion_spec.rb
new file mode 100644
index 000000000..7b6223db5
--- /dev/null
+++ b/spec/models/crop_companion_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CropCompanion, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 7b5698f9771bea51cf505114ea503b9e228b918a Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 28 Sep 2019 17:23:25 +1200
Subject: [PATCH 049/142] =?UTF-8?q?=F0=9F=91=A9=E2=80=8D=F0=9F=8C=BE=20Imp?=
 =?UTF-8?q?ort=20openfarm=20data=20(#2177)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
---
 Gemfile                                       |   9 +-
 Gemfile.lock                                  |  27 +--
 app/assets/stylesheets/_crops.scss            |  35 +++
 app/assets/stylesheets/_homepage.scss         |  91 +-------
 app/assets/stylesheets/_members.scss          |   9 +-
 app/assets/stylesheets/_photos.scss           |   9 -
 app/assets/stylesheets/_plantings.scss        |  39 ----
 app/assets/stylesheets/_variables.scss        |  18 ++
 app/assets/stylesheets/overrides.scss         | 220 ++++++++++++------
 app/controllers/charts/gardens_controller.rb  |   2 +-
 app/controllers/crops_controller.rb           |  32 ++-
 app/controllers/sessions_controller.rb        |   2 +-
 app/helpers/icons_helper.rb                   |  10 +
 app/helpers/photos_helper.rb                  |  66 +++---
 app/models/ability.rb                         |   1 +
 app/models/concerns/open_farm_data.rb         |  75 ++++++
 app/models/crop.rb                            |  23 +-
 app/models/photo.rb                           |   5 +-
 app/models/photo_association.rb               |   8 +-
 app/services/openfarm_service.rb              | 108 +++++++++
 app/views/crops/_actions.html.haml            |   8 +-
 app/views/crops/_alternate_names.html.haml    |  37 ++-
 app/views/crops/_crop.html.haml               |   2 +-
 app/views/crops/_form.html.haml               |  11 +-
 app/views/crops/_grown_for.html.haml          |   8 +-
 app/views/crops/_hierarchy.html.haml          |   4 +-
 app/views/crops/_info.haml                    |  25 ++
 app/views/crops/_photos.html.haml             |   6 +-
 app/views/crops/_planting_advice.html.haml    |  19 +-
 app/views/crops/_posts.html.haml              |  15 +-
 app/views/crops/_predictions.html.haml        |  81 ++++---
 app/views/crops/_scientific_names.html.haml   |  30 ++-
 app/views/crops/_thumbnail.html.haml          |  19 +-
 app/views/crops/_tiny.html.haml               |   1 +
 app/views/crops/_varieties.html.haml          |   6 +-
 app/views/crops/_wrangle.html.haml            |   5 +-
 app/views/crops/index.html.haml               |   9 +-
 app/views/crops/requested.haml                |   5 +-
 app/views/crops/search.html.haml              |  43 ++--
 app/views/crops/show.html.haml                |   5 +-
 app/views/follows/followers.html.haml         |   7 +-
 app/views/garden_types/index.html.haml        |   5 +-
 app/views/gardens/_actions.html.haml          |   2 +-
 app/views/gardens/_garden.html.haml           |   5 +
 app/views/gardens/index.html.haml             |  34 ++-
 app/views/gardens/show.html.haml              |  28 +--
 app/views/harvests/_actions.html.haml         |   4 +-
 app/views/harvests/_card.html.haml            |  13 +-
 app/views/harvests/_owner.html.haml           |  35 +--
 app/views/harvests/_planting.haml             |  10 +-
 app/views/harvests/index.html.haml            |  18 +-
 app/views/harvests/show.html.haml             |  60 ++---
 app/views/home/_blurb.html.haml               |   2 +-
 app/views/home/_crops.html.haml               |   5 +-
 app/views/home/_harvests.html.haml            |  22 +-
 app/views/home/_members.html.haml             |   2 +-
 app/views/home/_plantings.html.haml           |  23 +-
 app/views/home/_seeds.html.haml               |   2 +-
 app/views/home/index.html.haml                |  45 ++--
 app/views/layouts/_fact_card.haml             |   6 +
 app/views/layouts/_nav.haml                   |  17 +-
 app/views/layouts/_pagination.html.haml       |   2 +-
 app/views/layouts/application.html.haml       |   6 +-
 app/views/members/_location.html.haml         |  14 +-
 app/views/members/_member.haml                |   4 +-
 app/views/members/_tiny.haml                  |   2 +-
 app/views/members/nearby.html.haml            |   5 +-
 app/views/members/show.html.haml              |  35 +--
 app/views/photos/_card.html.haml              |   9 +-
 app/views/photos/_gallery.haml                |   2 +-
 app/views/photos/_hero.html.haml              |   7 +
 app/views/photos/_item_photos.haml            |  11 -
 app/views/photos/_likes.html.haml             |  25 +-
 app/views/photos/_photo.haml                  |   2 +-
 app/views/photos/index.html.haml              |  22 +-
 app/views/places/show.html.haml               |  42 ++--
 app/views/plantings/_actions.html.haml        |   4 +-
 app/views/plantings/_card.html.haml           |   8 +-
 app/views/plantings/_descendants.html.haml    |   6 +-
 app/views/plantings/_facts.haml               |  84 +++----
 app/views/plantings/_harvests.html.haml       |   4 +-
 app/views/plantings/_owner.haml               |  31 +--
 app/views/plantings/_progress.html.haml       |   4 +-
 app/views/plantings/_thumbnail.html.haml      |   6 +-
 app/views/plantings/index.html.haml           |  31 +--
 app/views/plantings/show.html.haml            |  32 ++-
 app/views/posts/_preview.haml                 |  20 +-
 app/views/posts/index.html.haml               |  66 +++---
 app/views/posts/show.html.haml                |  15 +-
 app/views/seeds/_actions.html.haml            |  12 +-
 app/views/seeds/_card.html.haml               |  13 +-
 app/views/seeds/_descendants.html.haml        |  16 +-
 app/views/seeds/_facts.html.haml              |  29 +++
 app/views/seeds/_owner.html.haml              |  19 ++
 app/views/seeds/index.html.haml               |  25 +-
 app/views/seeds/show.html.haml                |  98 ++++----
 app/views/timeline/_photos.html.haml          |   5 +-
 app/views/timeline/index.html.haml            |   9 +-
 config/locales/en.yml                         |   6 +-
 config/routes.rb                              |   1 +
 ...190902004225_add_openfarm_data_to_crops.rb |   5 +
 db/migrate/20190918033319_unique_urls.rb      |   6 +
 db/schema.rb                                  |   3 +
 db/seeds.rb                                   |   2 +
 lib/tasks/openfarm.rake                       |   9 +
 spec/factories/planting.rb                    |  21 ++
 spec/features/crops/request_new_crop_spec.rb  |   8 +-
 spec/features/gardens/actions_spec.rb         |   2 +-
 spec/features/gardens/gardens_spec.rb         |   8 +-
 spec/features/plantings/show_spec.rb          |  42 ++++
 spec/features/seeds/adding_seeds_spec.rb      |  12 +-
 spec/features/seeds/misc_seeds_spec.rb        |   8 +-
 spec/helpers/photos_helper_spec.rb            |  36 +--
 .../crops/_planting_advice.html.haml_spec.rb  |  67 ------
 spec/views/harvests/index.html.haml_spec.rb   |   2 +-
 spec/views/harvests/show.html.haml_spec.rb    |   2 +-
 spec/views/seeds/show.html.haml_spec.rb       |   2 +-
 117 files changed, 1354 insertions(+), 1086 deletions(-)
 create mode 100644 app/models/concerns/open_farm_data.rb
 create mode 100644 app/services/openfarm_service.rb
 create mode 100644 app/views/crops/_info.haml
 create mode 100644 app/views/gardens/_garden.html.haml
 create mode 100644 app/views/layouts/_fact_card.haml
 create mode 100644 app/views/photos/_hero.html.haml
 delete mode 100644 app/views/photos/_item_photos.haml
 create mode 100644 app/views/seeds/_facts.html.haml
 create mode 100644 app/views/seeds/_owner.html.haml
 create mode 100644 db/migrate/20190902004225_add_openfarm_data_to_crops.rb
 create mode 100644 db/migrate/20190918033319_unique_urls.rb
 create mode 100644 lib/tasks/openfarm.rake
 create mode 100644 spec/features/plantings/show_spec.rb
 delete mode 100644 spec/views/crops/_planting_advice.html.haml_spec.rb

diff --git a/Gemfile b/Gemfile
index cfa8ef248..2672e0aaf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,9 +54,6 @@ gem 'unicorn'                      # http server
 
 gem "comfortable_mexican_sofa", "~> 2.0.0"
 
-gem 'bootstrap-kaminari-views'     # bootstrap views for kaminari
-gem 'kaminari'                     # pagination
-
 gem 'active_utils'
 gem 'sidekiq'
 
@@ -73,6 +70,9 @@ gem 'devise'
 # nicely formatted URLs
 gem 'friendly_id'
 
+# validates URLs
+gem "validate_url"
+
 # gravatars
 gem 'gravatar-ultimate'
 
@@ -118,6 +118,9 @@ gem 'rack-protection', '>= 2.0.1'
 # Member to member messaging system
 gem 'mailboxer'
 
+gem 'faraday'
+gem 'faraday_middleware'
+
 group :production do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'
diff --git a/Gemfile.lock b/Gemfile.lock
index 48d41f060..5dc18108e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,10 +82,7 @@ GEM
       sassc-rails (>= 2.0.0)
     bootstrap-datepicker-rails (1.8.0.1)
       railties (>= 3.0)
-    bootstrap-kaminari-views (0.0.5)
-      kaminari (>= 0.13)
-      rails (>= 3.1)
-    bootstrap_form (4.3.0)
+    bootstrap_form (4.2.0)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
     builder (3.2.3)
@@ -191,6 +188,8 @@ GEM
       i18n (~> 1.6.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
     ffi (1.11.1)
     figaro (1.1.1)
       thor (~> 0.14)
@@ -273,18 +272,6 @@ GEM
       concurrent-ruby
       railties (>= 4.1)
     jwt (2.2.1)
-    kaminari (1.1.1)
-      activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
-      actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
-      activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
     kgio (2.11.2)
     kramdown (2.1.0)
     launchy (2.4.3)
@@ -550,6 +537,9 @@ GEM
       equalizer (~> 0.0.9)
       parser (~> 2.6.3)
       procto (~> 0.0.2)
+    validate_url (1.0.8)
+      activemodel (>= 3.0.0)
+      public_suffix
     warden (1.2.8)
       rack (>= 2.0.6)
     webdrivers (4.1.2)
@@ -582,7 +572,6 @@ DEPENDENCIES
   bonsai-elasticsearch-rails
   bootstrap (>= 4.3.1)
   bootstrap-datepicker-rails
-  bootstrap-kaminari-views
   bootstrap_form (>= 4.2.0)
   bullet
   bundler (>= 1.1.5)
@@ -604,6 +593,8 @@ DEPENDENCIES
   elasticsearch (< 7.0.0)
   factory_bot_rails
   faker
+  faraday
+  faraday_middleware
   figaro
   flickraw
   font-awesome-sass
@@ -621,7 +612,6 @@ DEPENDENCIES
   jquery-ui-rails
   js-routes
   jsonapi-resources
-  kaminari
   leaflet-rails
   letter_opener
   listen
@@ -662,6 +652,7 @@ DEPENDENCIES
   timecop
   uglifier
   unicorn
+  validate_url
   webdrivers
   webrat
   will_paginate
diff --git a/app/assets/stylesheets/_crops.scss b/app/assets/stylesheets/_crops.scss
index d56530bb5..2d72137b9 100644
--- a/app/assets/stylesheets/_crops.scss
+++ b/app/assets/stylesheets/_crops.scss
@@ -2,6 +2,41 @@
   height: 1em;
 }
 
+.crop-thumbnail {
+  .text {
+    bottom: 0;
+    color: $white;
+    margin: 0;
+    opacity: .9;
+    position: absolute;
+    text-align: center;
+    width: 100%;
+
+    h3 {
+      background-color: $brown;
+      font-size: 1em;
+    }
+
+    h5.crop-sci-name {
+      background-color: $beige;
+      color: $black;
+      font-size: .7em;
+    }
+
+    a {
+      color: $white;
+    }
+
+    a:hover {
+      color: $black;
+    }
+
+    .img-card {
+      border: 5%;
+    }
+  }
+}
+
 .planting {
   .crop-card {
     height: 100%;
diff --git a/app/assets/stylesheets/_homepage.scss b/app/assets/stylesheets/_homepage.scss
index 4910436af..d33364c23 100644
--- a/app/assets/stylesheets/_homepage.scss
+++ b/app/assets/stylesheets/_homepage.scss
@@ -1,94 +1,17 @@
-// signup widget on homepage
-
-// let's condense the hero unit a little
-.jumbotron {
-  background-color: darken($beige, 10%);
-  padding-bottom: 30px;
-  padding-top: 30px;
-
-  // signup widget on homepage
-  .signup {
-    background-color: lighten($green, 40%);
-    border: 1px solid lighten($green, 20%);
-    border-radius: 6px;
-    line-height: 200%;
-    padding: 15px;
-    text-align: center;
-  }
-
-  .info {
-    padding: .5em;
-    text-align: center;
-  }
-}
-
-// info under the main heading on homepage
-.homepage-cards {
-  display: flex;
-  flex: none;
-  flex-wrap: wrap;
-  margin: .5em;
-
-  .card {
-    left: -.5em;
-    margin: .5em;
-    min-height: 100px;
-    padding: 0;
-
-    %h3.crop-name {
-      font-size: 2em;
-    }
-  }
-
-  .crop-card {
-    min-height: 80px;
-    width: 120px;
-  }
-
-  .thumbnail {
-    margin: .5em;
-  }
-
-  .img-card {
-    height: 150px;
-  }
-
-}
-
-.member-cards {
-  display: flex;
-  flex: none;
-  flex-wrap: wrap;
-
-  .card {
-    margin: 1em;
-    width: 150px;
-  }
-}
 
 // stats shown on homepage. eg. "999 members..."
 .stats {
   font-weight: bold;
 }
 
-@include media-breakpoint-down(sm) {
-  .homepage-cards {
-    .seed-card {
-      min-height: 80px;
-      width: 100%;
-    }
-
-    .member-card {
-      min-height: 80px;
-      width: 150px;
-    }
+.crops,
+.seeds,
+.members {
+  .index-cards {
+    justify-content: center;
   }
 }
 
-@include media-breakpoint-up(md) {
-  .homepage-cards {
-    .card {
-      width: 200px;
-    }
-  }
+.homepage--list-item {
+  height: 100px;
 }
diff --git a/app/assets/stylesheets/_members.scss b/app/assets/stylesheets/_members.scss
index 76cf5eaef..1ab725311 100644
--- a/app/assets/stylesheets/_members.scss
+++ b/app/assets/stylesheets/_members.scss
@@ -21,10 +21,11 @@
   background-color: lighten($green, 30%);
   border-radius: 25px;
   display: inline-block;
-  font-size: 1em;
+  font-size: .8em;
   height: 30px;
   line-height: 30px;
   padding: 0 25px;
+  white-space: nowrap;
 
   a {
     color: $black;
@@ -55,3 +56,9 @@
   height: 250px;
   width: 100%;
 }
+
+.badge-location {
+  background-color: darken($blue, 10%);
+  border-radius: 5%;
+  color: $white;
+}
diff --git a/app/assets/stylesheets/_photos.scss b/app/assets/stylesheets/_photos.scss
index 5127f2336..831de851b 100644
--- a/app/assets/stylesheets/_photos.scss
+++ b/app/assets/stylesheets/_photos.scss
@@ -9,15 +9,6 @@
   display: block;
 }
 
-.photo-grid-item {
-  float: left;
-
-  img {
-    display: block;
-    max-width: 100%;
-  }
-}
-
 .hero-photo {
   max-height: 500px;
 }
diff --git a/app/assets/stylesheets/_plantings.scss b/app/assets/stylesheets/_plantings.scss
index 820fd1329..897631e83 100755
--- a/app/assets/stylesheets/_plantings.scss
+++ b/app/assets/stylesheets/_plantings.scss
@@ -26,14 +26,6 @@
       font-size: 200%;
     }
   }
-  .progress {
-    .progress-bar {
-      border-bottom-color: $green;
-    }
-    .progress-bar:after {
-      background-color: $beige;
-    }
-  }
 
   .planting-name {
     position: relative;
@@ -42,7 +34,6 @@
   }
 
   .planting-quick-actions {
-    background-color: $white;
     left: 0;
     position: absolute;
     top: 0;
@@ -62,33 +53,3 @@
     }
   }
 }
-
-.planting-facts {
-  display: flex;
-  flex-wrap: wrap;
-  flex: none;
-
-  .planting-fact-card {
-    background: $white;
-    background: $white;
-    border-radius: 5%;
-    border: 1px solid lighten($green, 20%);
-    margin: 1em;
-    padding: 1em;
-    text-align: center;
-    width: 120px;
-
-    strong {
-      font-align: center;
-      font-size: 4em;
-    }
-
-    span {
-      display: block;
-    }
-
-    img {
-      height: 50%;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
index 21fdceac3..5d9bdda5b 100644
--- a/app/assets/stylesheets/_variables.scss
+++ b/app/assets/stylesheets/_variables.scss
@@ -42,6 +42,20 @@ $dark: (
   light: lighten($brown, 20%)
 );
 
+
+$grid-breakpoints: (
+  // Extra small screen / phone
+  xs: 0,
+  // Small screen / phone
+  sm: 576px,
+  // Medium screen / tablet
+  md: 768px,
+  // Large screen / desktop
+  lg: 1200px,
+  // Extra large screen / wide desktop
+  xl: 1800px
+);
+
 // Nav bar
 $navbar-default-bg: $brown;
 $navbar-default-bg-highlight: $brown;
@@ -52,3 +66,7 @@ $navbar-default-link-active-color: darken($beige, 80%);
 $navbar-default-brand-color: lighten($green, 20%);
 
 $highest-level:  1070;
+
+$progress-height: 5em;
+$progress-bar-color: $green;
+$progress-bg: $white;
\ No newline at end of file
diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index 4e078f014..df44ca6e8 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -8,11 +8,6 @@ body {
   font-family: $font-family-sans-serif;
 }
 
-section {
-  margin: 0;
-  padding-bottom: 1em;
-}
-
 .ellipsis {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -33,13 +28,8 @@ a:hover {
   text-decoration: none;
 }
 
-.card a:hover {
-  background-color: $beige;
-  color: $blue;
-}
-
-ul.list-inline > li.first {
-  padding-left: 0;
+h1 {
+  font-size: 180%;
 }
 
 h2 {
@@ -63,14 +53,93 @@ h3 {
   }
 }
 
+section {
+  margin: .5em 0 0;
+  padding: 0 0 1em;
+
+  h2 {
+    background-color: $green;
+    color: $white;
+    padding: .2em;
+
+    a {
+      color: $white;
+    }
+  }
+
+  .btn {
+    border: 1px solid $green;
+  }
+}
+
+.layout-actions {
+  border: 1px solid lighten($green, 20%);
+  float: right;
+}
+
 .index-cards {
   display: flex;
   flex: none;
   flex-wrap: wrap;
 
   .card {
-    margin: 1em 1em 1em 0;
+    background: $white;
+    // border: 1px solid lighten($brown, 20%);
+    border-radius: 5%;
+    margin: .5em .5em .5em 0;
     width: 200px;
+
+    .img-card {
+      border-top-left-radius: 5%;
+      border-top-right-radius: 5%;
+    }
+  }
+
+  .card:hover {
+    background-color: $beige;
+  }
+}
+
+.card {
+  margin-bottom: 1em;
+
+  .img-card {
+    height: 180px;
+    object-fit: cover;
+    width: 100%;
+  }
+
+  a:hover {
+    background-color: $beige;
+    color: $blue;
+  }
+}
+
+.facts {
+  display: flex;
+  flex: none;
+  flex-wrap: wrap;
+
+  .card {
+    margin: 1em;
+    max-width: 100%;
+    padding: 1em;
+    text-align: center;
+    width: 170px;
+
+    strong {
+      display: block;
+      font-size: 2em;
+      text-align: center;
+    }
+
+    span {
+      display: block;
+    }
+
+    img {
+      height: 50%;
+    }
   }
 }
 
@@ -78,12 +147,6 @@ img.img-icon {
   width: 1.2em;
 }
 
-img.img-card {
-  height: 180px;
-  object-fit: cover;
-  width: 100%;
-}
-
 img.img-responsive {
   max-width: 100%;
 }
@@ -95,23 +158,13 @@ img.avatar {
   z-index: 2;
 }
 
-// this is used for eg. crops and members index pages
-.six-across:nth-child(6n+1) {
-  margin-left: 0;
-}
-
-.three-across:nth-child(3n+1) {
-  clear: both;
-  margin-left: 0;
-}
-
-.card {
-  margin-bottom: 1em
-}
-
 .progress {
   border-radius: 0;
-
+  height: 2em;
+  .progress-bar {
+    height: 2em;
+    background-color: $progress-bar-color
+  }
   .progress-bar-text {
     text-align: center;
   }
@@ -154,7 +207,9 @@ footer {
 
 // ensure footer is pushed to bottom of browser window
 #maincontainer {
+  max-width: 2500px;
   min-height: 80%;
+  padding: 1em;
 }
 
 // Autosuggest
@@ -219,30 +274,6 @@ ul.thumbnail-buttons {
   visibility: visible;
 }
 
-.container {
-  max-width: 1500px;
-}
-
-// Small devices (landscape phones, less than 768px)
-@include media-breakpoint-down(md) {
-  .planting-thumbnail {
-    dl.planting-attributes {
-      width: 100%;
-
-      dt {
-        text-align: left;
-        width: 120px;
-      }
-
-      dd {
-        margin-left: auto;
-        padding-left: 120px;
-      }
-    }
-  }
-}
-
-
 .form-page {
   text-align: center;
 
@@ -253,10 +284,32 @@ ul.thumbnail-buttons {
     padding: 1em;
     text-align: center;
   }
+}
 
-  .crop-card {
-    width: 100px;
+.jumbotron {
+  background-color: $beige;
+  margin-bottom: 1em;
+  padding-bottom: 30px;
+  padding-top: 30px;
+
+  // signup widget on homepage
+  .signup {
+    background-color: lighten($green, 40%);
+    border: 1px solid lighten($green, 20%);
+    border-radius: 6px;
+    line-height: 200%;
+    padding: 15px;
+    text-align: center;
   }
+
+  .info {
+    padding: .5em;
+    text-align: center;
+  }
+}
+
+.breadcrumb {
+  background-color: $beige;
 }
 
 // Overrides applying only to mobile view. This must be at the end of the overrides file.
@@ -264,6 +317,23 @@ ul.thumbnail-buttons {
 @include media-breakpoint-down(xs) {
   #maincontainer {
     width: 100%;
+    padding: 10px;
+  }
+
+  h1 {
+    font-size: 200%;
+  }
+
+  h2 {
+    font-size: 130%;
+  }
+
+  h3 {
+    font-size: 120%;
+  }
+
+  .card-title {
+    margin-bottom: 0;
   }
 
   .sidebar {
@@ -272,7 +342,7 @@ ul.thumbnail-buttons {
     padding-left: 0;
   }
 
-  #map {
+  .map {
     height: 300px;
   }
 
@@ -289,20 +359,32 @@ ul.thumbnail-buttons {
     }
   }
 
-  #maincontainer {
-    padding: 10px;
+  .nav .btn {
+    background-color: lighten($green, 50%);
+    width: 100%;
   }
 
-  .homepage-cards {
-    .crop-card {
-      width: 50px;
-    }
+  section .btn {
+    width: 100%;
   }
 
   .index-cards {
     .card {
-      width: 100%;
-      margin: 0.5em;
+      margin: .2em;
+      width: 45%;
+
+      // Shrink title to fit more on page
+      .card-title {
+        font-size: 1em;
+      }
+
+      // Restrict height of image when on smaller screens
+      .img-card {
+        height: 100px;
+        object-fit: cover;
+        width: 100%;
+      }
+
     }
   }
 }
diff --git a/app/controllers/charts/gardens_controller.rb b/app/controllers/charts/gardens_controller.rb
index 8b67bc106..b9d25bb53 100644
--- a/app/controllers/charts/gardens_controller.rb
+++ b/app/controllers/charts/gardens_controller.rb
@@ -7,7 +7,7 @@ module Charts
       @garden.plantings.where.not(planted_at: nil)
         .order(finished_at: :desc).each do |p|
         # use finished_at if we have it, otherwise use predictions
-        finish = p.finished_at.presence || p.finish_predicted_at
+        finish = p.finished_at.presence || p.finish_predicted_at || Time.zone.today.to_date
         @data << [p.crop.name, p.planted_at, finish] if finish.present?
       end
       render json: @data
diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index 8a02e195c..65a559423 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -4,7 +4,7 @@ class CropsController < ApplicationController
   before_action :authenticate_member!, except: %i(index hierarchy search show)
   load_and_authorize_resource
   skip_authorize_resource only: %i(hierarchy search)
-  respond_to :html, :json, :rss, :csv
+  respond_to :html, :json, :rss, :csv, :svg
   responders :flash
 
   def index
@@ -35,8 +35,14 @@ class CropsController < ApplicationController
     respond_with @crops
   end
 
+  def openfarm
+    @crop = Crop.find(params[:crop_slug])
+    @crop.update_openfarm_data!
+    respond_with @crop, location: @crop
+  end
+
   def hierarchy
-    @crops = Crop.toplevel
+    @crops = Crop.toplevel.order(:name)
     respond_with @crops
   end
 
@@ -60,6 +66,7 @@ class CropsController < ApplicationController
 
     respond_to do |format|
       format.html
+      format.svg { send_data(@crop.svg_icon, type: "image/svg+xml", disposition: "inline") }
       format.json { render json: @crop.to_json(crop_json_fields) }
     end
   end
@@ -95,15 +102,20 @@ class CropsController < ApplicationController
 
   def update
     @crop = Crop.find_by!(slug: params[:slug])
-    previous_status = @crop.approval_status
 
-    @crop.creator = current_member if previous_status == "pending"
+    if can?(:wrangle, @crop)
+      @crop.approval_status = 'rejected' if params.fetch("reject", false)
+      @crop.approval_status = 'approved' if params.fetch("approve", false)
+    end
 
+    @crop.creator = current_member if @crop.approval_status == "pending"
     if @crop.update(crop_params)
       recreate_names('alt_name', 'alternate')
       recreate_names('sci_name', 'scientific')
 
-      notifier.deliver_now! if previous_status == "pending"
+      notifier.deliver_now! if @crop.approval_status_changed?(from: "pending", to: "approved")
+    else
+      @crop.approval_status = @crop.approval_status_was
     end
 
     respond_with @crop
@@ -162,18 +174,18 @@ class CropsController < ApplicationController
   end
 
   def crop_params
-    params.require(:crop).permit(:en_wikipedia_url,
+    params.require(:crop).permit(
+      :en_wikipedia_url,
       :name,
       :parent_id,
-      :creator_id,
       :perennial,
-      :approval_status,
       :request_notes,
       :reason_for_rejection,
       :rejection_notes,
       scientific_names_attributes: %i(scientific_name
                                       _destroy
-                                      id))
+                                      id)
+    )
   end
 
   def filename
@@ -198,7 +210,7 @@ class CropsController < ApplicationController
     q = Crop.approved.includes(:scientific_names, plantings: :photos)
     q = q.popular unless @sort == 'alpha'
     q.order(Arel.sql("LOWER(crops.name)"))
-      .includes(:photos).paginate(page: params[:page])
+      .includes(:photos).paginate(page: params[:page], per_page: 30)
   end
 
   def requested_crops
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 47870d38d..b8de4b54e 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,5 +1,5 @@
 class SessionsController < Devise::SessionsController
-  respond_to :json
+  respond_to :html, :json
 
   def create
     super do |_resource|
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index a691b5218..b21cf0757 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -73,6 +73,16 @@ module IconsHelper
     icon('fas', 'heart')
   end
 
+  def crop_icon(crop)
+    if crop.svg_icon.present?
+      image_tag(crop_path(crop, format: 'svg'), class: 'crop-icon')
+    elsif crop.parent.present?
+      crop_icon(crop.parent)
+    else
+      planting_icon
+    end
+  end
+
   def sunniness_icon(sunniness)
     if sunniness.present?
       image_tag("sunniness_#{sunniness}.png", class: 'img', alt: sunniness, width: 55)
diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index 9e1053820..dc6d88348 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -1,37 +1,47 @@
 module PhotosHelper
-  def crop_image_path(crop, full_size: false)
-    photo_or_placeholder(crop, full_size: full_size)
-  end
-
-  def garden_image_path(garden, full_size: false)
-    photo_or_placeholder(garden, full_size: full_size)
-  end
-
-  def planting_image_path(planting, full_size: false)
-    photo_or_placeholder(planting, full_size: full_size)
-  end
-
-  def harvest_image_path(harvest, full_size: false)
-    photo_or_placeholder(harvest, full_size: full_size)
-  end
-
-  def seed_image_path(seed, full_size: false)
-    photo_or_placeholder(seed, full_size: full_size)
-  end
-
-  private
-
-  def photo_or_placeholder(item, full_size: false)
-    if item.default_photo.present?
-      item_photo(item, full_size: full_size)
+  def crop_image_path(crop)
+    if crop.default_photo.present?
+      # The flickr thumbnails are too small, use full size
+      if crop.default_photo.source == 'flickr'
+        crop.default_photo.fullsize_url
+      else
+        crop.default_photo.thumbnail_url
+      end
     else
       placeholder_image
     end
   end
 
-  def item_photo(item, full_size:)
-    photo = item.default_photo
-    full_size ? photo.fullsize_url : photo.thumbnail_url
+  def garden_image_path(garden)
+    photo_or_placeholder(garden)
+  end
+
+  def planting_image_path(planting)
+    photo_or_placeholder(planting)
+  end
+
+  def harvest_image_path(harvest)
+    photo_or_placeholder(harvest)
+  end
+
+  def seed_image_path(seed)
+    photo_or_placeholder(seed)
+  end
+
+  private
+
+  def photo_or_placeholder(item)
+    if item.default_photo.present?
+      item_photo(item)
+    elsif item.respond_to?(:crop)
+      crop_image_path(item.crop)
+    else
+      placeholder_image
+    end
+  end
+
+  def item_photo(item)
+    item.default_photo.fullsize_url
   end
 
   def placeholder_image
diff --git a/app/models/ability.rb b/app/models/ability.rb
index f8b05d3cf..b2231e64b 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -76,6 +76,7 @@ class Ability
       can :manage, Crop
       can :manage, ScientificName
       can :manage, AlternateName
+      can :openfarm, Crop
     end
 
     # any member can create a crop provisionally
diff --git a/app/models/concerns/open_farm_data.rb b/app/models/concerns/open_farm_data.rb
new file mode 100644
index 000000000..f56c0fa66
--- /dev/null
+++ b/app/models/concerns/open_farm_data.rb
@@ -0,0 +1,75 @@
+module OpenFarmData
+  extend ActiveSupport::Concern
+
+  included do # rubocop:disable Metrics/BlockLength
+    def update_openfarm_data!
+      OpenfarmService.new.update_crop(self)
+    end
+
+    def of_photo
+      fetch_attr('main_image_path')
+    end
+
+    def height
+      fetch_attr('height')
+    end
+
+    def spread
+      fetch_attr('spread')
+    end
+
+    def svg_icon
+      fetch_attr('svg_icon')
+    end
+
+    def tags_array
+      fetch_attr('tags_array')
+    end
+
+    def description
+      fetch_attr('description')
+    end
+
+    def row_spacing
+      fetch_attr('row_spacing')
+    end
+
+    def common_names
+      fetch_attr('common_names')
+    end
+
+    def guides_count
+      fetch_attr('guides_count')
+    end
+
+    def binomial_name
+      fetch_attr('binomial_name')
+    end
+
+    def sowing_method
+      fetch_attr('sowing_method')
+    end
+
+    def main_image_path
+      fetch_attr('main_image_path')
+    end
+
+    def sun_requirements
+      fetch_attr('sun_requirements')
+    end
+
+    def growing_degree_days
+      fetch_attr('growing_degree_days')
+    end
+
+    def processing_pictures
+      fetch_attr('processing_pictures')
+    end
+  end
+
+  def fetch_attr(key)
+    return if openfarm_data.blank?
+
+    openfarm_data.fetch('attributes', {}).fetch(key, nil)
+  end
+end
diff --git a/app/models/crop.rb b/app/models/crop.rb
index 1c787c8f9..a9dfabe52 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -1,10 +1,14 @@
 class Crop < ApplicationRecord
   extend FriendlyId
   include PhotoCapable
+  include OpenFarmData
   friendly_id :name, use: %i(slugged finders)
 
   ##
   ## Relationships
+  belongs_to :creator, class_name: 'Member', optional: true, inverse_of: :created_crops
+  belongs_to :requester, class_name: 'Member', optional: true, inverse_of: :requested_crops
+  belongs_to :parent, class_name: 'Crop', optional: true, inverse_of: :varieties
   has_many :scientific_names, dependent: :delete_all
   accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
   has_many :alternate_names, dependent: :delete_all
@@ -14,11 +18,8 @@ class Crop < ApplicationRecord
   has_many :photo_associations, dependent: :delete_all
   has_many :photos, through: :photo_associations
   has_many :plant_parts, -> { joins_members.distinct.order("plant_parts.name") }, through: :harvests
-  belongs_to :creator, class_name: 'Member', optional: true, inverse_of: :created_crops
-  belongs_to :requester, class_name: 'Member', optional: true, inverse_of: :requested_crops
-  belongs_to :parent, class_name: 'Crop', optional: true, inverse_of: :varieties
   has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id', dependent: :nullify, inverse_of: :parent
-  has_many :crop_companions, foreign_key: :crop_a_id, inverse_of: :crop_a, dependent: :delete_all
+  has_many :crop_companions, foreign_key: :crop_a_id, dependent: :delete_all, inverse_of: :crop_a
   has_many :companions, through: :crop_companions, source: :crop_b, class_name: 'Crop'
   has_many :crop_posts, dependent: :delete_all
   has_many :posts, through: :crop_posts, dependent: :delete_all
@@ -42,8 +43,6 @@ class Crop < ApplicationRecord
   ## Validations
   # Reasons are only necessary when rejecting
   validates :reason_for_rejection, presence: true, if: :rejected?
-  ## This validation addresses a race condition
-  validate :approval_status_cannot_be_changed_again
   validate :must_be_rejected_if_rejected_reasons_present
   validate :must_have_meaningful_reason_for_rejection
   ## Wikipedia urls are only necessary when approving a crop
@@ -164,6 +163,10 @@ class Crop < ApplicationRecord
     }
   end
 
+  def fetch_from_openfarm!
+    OpenfarmService.new.update_crop(self)
+  end
+
   private
 
   def count_uses_of_property(col_name)
@@ -174,14 +177,6 @@ class Crop < ApplicationRecord
       .count
   end
 
-  # Custom validations
-  def approval_status_cannot_be_changed_again
-    previous = previous_changes.include?(:approval_status) ? previous_changes.approval_status : {}
-    return unless previous.include?(:rejected) || previous.include?(:approved)
-
-    errors.add(:approval_status, "has already been set to #{approval_status}")
-  end
-
   def must_be_rejected_if_rejected_reasons_present
     return if rejected?
     return unless reason_for_rejection.present? || rejection_notes.present?
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 304c43c6f..a1e7099c1 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -2,11 +2,14 @@ class Photo < ApplicationRecord
   include Likeable
   include Ownable
 
-  PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post).freeze
+  PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post Crop).freeze
 
   has_many :photo_associations, foreign_key: :photo_id, dependent: :delete_all, inverse_of: :photo
   has_many :crops, through: :photo_associations
 
+  validates :fullsize_url, url: true, uniqueness: true
+  validates :thumbnail_url, url: true, uniqueness: true
+
   # creates a relationship for each assignee type
   PHOTO_CAPABLE.each do |type|
     has_many type.downcase.pluralize.to_s.to_sym,
diff --git a/app/models/photo_association.rb b/app/models/photo_association.rb
index 24eb79e80..89e495b0f 100644
--- a/app/models/photo_association.rb
+++ b/app/models/photo_association.rb
@@ -18,12 +18,18 @@ class PhotoAssociation < ApplicationRecord
   end
 
   def set_crop
-    self.crop_id = photographable.crop_id if %w(Planting Seed Harvest).include?(photographable_type)
+    if %w(Planting Seed Harvest).include?(photographable_type)
+      self.crop_id = photographable.crop_id
+    elsif photographable_type == 'Crop'
+      self.crop_id = photographable_id
+    end
   end
 
   private
 
   def photo_and_item_have_same_owner
+    return unless photographable_type != 'Crop'
+
     errors.add(:photo, "must have same owner as item it links to") unless photographable.owner_id == photo.owner_id
   end
 end
diff --git a/app/services/openfarm_service.rb b/app/services/openfarm_service.rb
new file mode 100644
index 000000000..b9cd243c6
--- /dev/null
+++ b/app/services/openfarm_service.rb
@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+BASE = 'https://openfarm.cc/api/v1/'
+# BASE = 'http://127.0.0.1:3000/api/v1/'
+
+class OpenfarmService
+  def initialize
+    @cropbot = Member.find_by(login_name: 'cropbot')
+  end
+
+  def import!
+    Crop.all.order(updated_at: :desc).each do |crop|
+      Rails.logger.debug("#{crop.id}, #{crop.name}")
+      update_crop(crop) if crop.valid?
+    end
+  end
+
+  def update_crop(crop)
+    openfarm_record = fetch(crop.name)
+    if openfarm_record.present? && openfarm_record.is_a?(String)
+      Rails.logger.info(openfarm_record)
+    elsif openfarm_record.present? && openfarm_record.fetch('data', false)
+      crop.update! openfarm_data: openfarm_record.fetch('data', false)
+      save_companions(crop, openfarm_record)
+      save_photos(crop)
+    else
+      Rails.logger.debug "\tcrop not found on Open Farm"
+      crop.update!(openfarm_data: false)
+    end
+  end
+
+  def save_companions(crop, openfarm_record)
+    companions = openfarm_record.fetch('data').fetch('relationships').fetch('companions').fetch('data')
+    crops = openfarm_record.fetch('included', []).select { |rec| rec["type"] == 'crops' }
+    CropCompanion.transaction do
+      companions.each do |com|
+        companion_crop_hash = crops.detect { |c| c.fetch('id') == com.fetch('id') }
+        companion_crop_name = companion_crop_hash.fetch('attributes').fetch('name').downcase
+        companion_crop = Crop.where('lower(name) = ?', companion_crop_name).first
+        companion_crop = Crop.create!(name: companion_crop_name, requester: @cropbot, approval_status: "pending") if companion_crop.nil?
+        crop.companions << companion_crop unless crop.companions.where(id: companion_crop.id).any?
+      end
+    end
+  end
+
+  def save_photos(crop)
+    pictures = fetch_pictures(crop.name)
+    pictures.each do |picture|
+      data = picture.fetch('attributes')
+      Rails.logger.debug(data)
+      next unless data.fetch('image_url').start_with? 'http'
+      next if Photo.find_by(source_id: picture.fetch('id'), source: 'openfarm')
+
+      photo = Photo.new(
+        source_id:     picture.fetch('id'),
+        source:        'openfarm',
+        owner:         @cropbot,
+        thumbnail_url: data.fetch('thumbnail_url'),
+        fullsize_url:  data.fetch('image_url'),
+        title:         'Open Farm photo',
+        license_name:  'No rights reserved',
+        link_url:      "https://openfarm.cc/en/crops/#{name_to_slug(crop.name)}"
+      )
+      if photo.valid?
+        Photo.transaction do
+          photo.save
+          PhotoAssociation.find_or_create_by! photo: photo, photographable: crop
+        end
+        Rails.logger.debug "\t saved photo #{photo.id} #{photo.source_id}"
+      else
+        Rails.logger.warn "Photo not valid"
+      end
+    end
+  end
+
+  def fetch(name)
+    conn.get("crops/#{name_to_slug(name)}.json").body
+  rescue NoMethodError
+    Rails.logger.debug "error fetching crop"
+    Rails.logger.debug "BODY: "
+    Rails.logger.debug body
+  end
+
+  def name_to_slug(name)
+    CGI.escape(name.gsub(' ', '-').downcase)
+  end
+
+  def fetch_all(page)
+    conn.get("crops.json?page=#{page}").body.fetch('data', {})
+  end
+
+  def fetch_pictures(name)
+    body = conn.get("crops/#{name_to_slug(name)}/pictures.json").body
+    body.fetch('data', false)
+  rescue StandardError
+    Rails.logger.debug "Error fetching photos"
+    Rails.logger.debug []
+  end
+
+  private
+
+  def conn
+    Faraday.new BASE do |conn|
+      conn.response :json, content_type: /\bjson$/
+      conn.adapter Faraday.default_adapter
+    end
+  end
+end
diff --git a/app/views/crops/_actions.html.haml b/app/views/crops/_actions.html.haml
index 60d337c77..1fd159662 100644
--- a/app/views/crops/_actions.html.haml
+++ b/app/views/crops/_actions.html.haml
@@ -1,16 +1,16 @@
 - if @crop.approved? && signed_in?
-  .crop-actions
+  .nav.crop-actions
     - if can? :create, Planting
-      = link_to new_planting_path(crop_id: crop.id), class: 'btn btn-sm' do
+      = link_to new_planting_path(crop_id: crop.id), class: 'list-group-item btn' do
         = planting_icon
         = t('buttons.plant_crop', crop_name: crop.name)
 
     - if can? :create, Harvest
-      = link_to new_harvest_path(crop_id: crop.id), class: 'btn btn-sm' do
+      = link_to new_harvest_path(crop_id: crop.id), class: 'list-group-item btn' do
         = harvest_icon
         = t('buttons.harvest_crop', crop_name: crop.name)
 
     - if can? :create, Seed
-      = link_to new_seed_path(crop_id: crop.id), class: 'btn btn-sm' do
+      = link_to new_seed_path(crop_id: crop.id), class: 'list-group-item btn' do
         = seed_icon
         = t('buttons.add_seed_to_stash', crop_name: crop.name)
diff --git a/app/views/crops/_alternate_names.html.haml b/app/views/crops/_alternate_names.html.haml
index 5d75b81f3..04c4314fc 100644
--- a/app/views/crops/_alternate_names.html.haml
+++ b/app/views/crops/_alternate_names.html.haml
@@ -1,26 +1,23 @@
 .alternate_names
   %h4 Alternate names
-  - if crop.alternate_names.empty?
-    %p None known.
-  - else
-    %ul.list-group.list-group-flush
-      - crop.alternate_names.each do |an|
-        %li.list-group-item.d-flex.justify-content-between.align-items-center
-          - if can? :edit, an
-            .dropdown.planting-actions
-              %a#crop-actions-altnames.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button", :href => '#'}
-                = an.name
-              .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "crop-actions-altnames"}
-                - if can? :edit, an
-                  = link_to edit_alternate_name_path(an), class: 'dropdown-item' do
-                    = edit_icon
-                    = t('.edit')
-                - if can? :destroy, an
-                  = link_to an, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item' do
-                    = delete_icon
-                    = t('.delete')
-          - else
+  - if crop.alternate_names.any?
+    - crop.alternate_names.each do |an|
+      - if can? :edit, an
+        .dropdown.planting-actions
+          %a#crop-actions-altnames.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button", :href => '#'}
             = an.name
+          .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "crop-actions-altnames"}
+            - if can? :edit, an
+              = link_to edit_alternate_name_path(an), class: 'dropdown-item' do
+                = edit_icon
+                = t('.edit')
+            - if can? :destroy, an
+              = link_to an, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item' do
+                = delete_icon
+                = t('.delete')
+      - else
+        .badge= an.name
+
 
   %p.text-right
     - if can? :edit, crop
diff --git a/app/views/crops/_crop.html.haml b/app/views/crops/_crop.html.haml
index 40bd4e508..83e82ffb0 100644
--- a/app/views/crops/_crop.html.haml
+++ b/app/views/crops/_crop.html.haml
@@ -1,6 +1,6 @@
 .card.card-crop
   .crop-image
-    = link_to image_tag(crop_image_path(crop, full_size: true),
+    = link_to image_tag(crop_image_path(crop),
                           alt: '',
                           class: 'img img-card'),
                           crop
diff --git a/app/views/crops/_form.html.haml b/app/views/crops/_form.html.haml
index 4c087ff5d..a0f981959 100644
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -94,8 +94,8 @@
 
       -# Now, for crop wranglers, let's have approval/rejection at the bottom of the page
       - if can?(:wrangle, @crop) && @crop.requester
-        %h2 Approve or reject pending crops
-        = f.select(:approval_status, @crop.approval_statuses, {})
+        -# %h2 Approve or reject pending crops
+        -# = f.select(:approval_status, @crop.approval_statuses, {})
         = f.select(:reason_for_rejection, @crop.reasons_for_rejection, include_blank: true)
 
         = f.text_area :rejection_notes, rows: 3
@@ -103,4 +103,9 @@
           Please provide additional notes why this crop request was rejected if the above reasons do not apply.
 
     .card-footer
-      .text-right= f.submit 'Save'
+      .text-right
+        - if @crop.approved?
+          = f.submit 'Save'
+        - else
+          = f.submit 'Reject', class: 'btn btn-danger', name: 'reject'
+          = f.submit 'Approve and save', class: 'btn btn-success', name: 'approve'
diff --git a/app/views/crops/_grown_for.html.haml b/app/views/crops/_grown_for.html.haml
index 0544bdb5f..dccb4821b 100644
--- a/app/views/crops/_grown_for.html.haml
+++ b/app/views/crops/_grown_for.html.haml
@@ -1,8 +1,6 @@
-%p
-  %strong Grown for:
-  - if crop.harvests.empty?
-    not known.
-  - else
+- if crop.harvests.any?
+  %p
+    %strong Grown for:
     - crop.popular_plant_parts.each do |plant_part, frequency|
     - id, name = plant_part
       = link_to name, plant_part_path(id: id)
diff --git a/app/views/crops/_hierarchy.html.haml b/app/views/crops/_hierarchy.html.haml
index a4b760354..989c5145b 100644
--- a/app/views/crops/_hierarchy.html.haml
+++ b/app/views/crops/_hierarchy.html.haml
@@ -4,8 +4,8 @@
     - max = 0 # list all without "show all" toggle button
   - display_crops.each do |c|
     %li.crop-hierarchy{ class: (max != 0 && @count >= max) || !c.approved? ? ['hide', 'toggle'] : [] }
-      = link_to c, c
+      = render 'crops/tiny', crop: c
       - @count += 1
       - if c.varieties.present?
-        - c.varieties.each do |v|
+        - c.varieties.order(:name).each do |v|
           = render partial: 'hierarchy', locals: { display_crops: [v], max: max }
diff --git a/app/views/crops/_info.haml b/app/views/crops/_info.haml
new file mode 100644
index 000000000..efaf693cc
--- /dev/null
+++ b/app/views/crops/_info.haml
@@ -0,0 +1,25 @@
+.row
+  .col-md-9
+    %h1
+      = crop_icon(@crop)
+      %strong= @crop.name.titleize
+      - unless @crop.approved?
+        %badge.badge-warning=@crop.approval_status
+      %small.text-muted= @crop.default_scientific_name
+    - if @crop.sowing_method.present?
+      %h2= @crop.sowing_method
+    - if @crop.sun_requirements.present?
+      %p
+        Plant in #{@crop.sun_requirements}
+    %p.text-muted
+      - if !@crop.plantings.empty?
+        #{@crop.name.titleize} has been planted
+        = pluralize(@crop.plantings.size, "time")
+        by #{ENV['GROWSTUFF_SITE_NAME']} members.
+      - else
+        Nobody is growing this yet. You could be the first!
+    - if @crop.description.present?
+      %p= @crop.description
+  .col-md-3
+    = image_tag crop_image_path(@crop),
+      class: 'img-responsive shadow rounded crop-hero-photo', alt: 'photo of crop'
diff --git a/app/views/crops/_photos.html.haml b/app/views/crops/_photos.html.haml
index 71358d541..8fe35a6cf 100644
--- a/app/views/crops/_photos.html.haml
+++ b/app/views/crops/_photos.html.haml
@@ -1,9 +1,7 @@
 - if @crop.photos.size.positive?
   %h2 #{photo_icon} Photos
-  - [Planting, Harvest, Seed].each do |model_name|
+  - [Crop, Planting, Harvest, Seed].each do |model_name|
     - if photos.by_model(model_name).size.positive?
       %h3 #{@crop.name.capitalize} #{t("activerecord.models.#{model_name.to_s.downcase}.other")}
-      = render 'photos/gallery', photos: photos.by_model(model_name).order(likes_count: :desc).limit(8)
-
+      = render 'photos/gallery', photos: photos.by_model(model_name).order(likes_count: :desc).limit(5)
   = link_to 'more photos »', crop_photos_path(@crop), class: 'btn'
-  %hr/
diff --git a/app/views/crops/_planting_advice.html.haml b/app/views/crops/_planting_advice.html.haml
index 4a444794a..a554a7058 100644
--- a/app/views/crops/_planting_advice.html.haml
+++ b/app/views/crops/_planting_advice.html.haml
@@ -1,15 +1,6 @@
-%p
-  %strong Plant from:
-  - if crop.planted_from.empty?
-    not known.
-  - else
-    - planted_from = crop.planted_from.sort_by { |_, freq| freq }.reverse
-    = planted_from.map { |s, freq| "#{s} (#{freq})" }.join(", ")
+- if crop.guides_count.present? && crop.guides_count.positive?
+  %p
+    There are
+    = link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-').downcase}" do
+      #{crop.guides_count} growing guides on Open Farm
 
-%p
-  %strong Plant in:
-  - if crop.sunniness.empty?
-    not known.
-  - else
-    - sunniness = crop.sunniness.sort_by { |_, freq| freq }.reverse
-    = sunniness.map { |s, freq| "#{s} (#{freq})" }.join(", ")
diff --git a/app/views/crops/_posts.html.haml b/app/views/crops/_posts.html.haml
index 2012f642a..1fcfea2fc 100644
--- a/app/views/crops/_posts.html.haml
+++ b/app/views/crops/_posts.html.haml
@@ -11,13 +11,12 @@
       = render partial: "shared/signin_signup",
               locals: { to: "post your tips and experiences growing #{crop.name.pluralize}" }
 - else
-  .pagination
-    = page_entries_info @posts
-    = render 'layouts/pagination', collection: @posts
-  - @posts.each do |post|
-    = render 'posts/preview', post: post
 
-  .pagination
-    = page_entries_info @posts
-    = render 'layouts/pagination', collection: @posts
+  = render 'layouts/pagination', collection: @posts
+
+  .index-cards
+    - @posts.each do |post|
+      = render 'posts/preview', post: post
+
+  = render 'layouts/pagination', collection: @posts
 
diff --git a/app/views/crops/_predictions.html.haml b/app/views/crops/_predictions.html.haml
index 82df172df..02e3bbacc 100644
--- a/app/views/crops/_predictions.html.haml
+++ b/app/views/crops/_predictions.html.haml
@@ -1,49 +1,58 @@
-%h3
+%h2
   = icon 'fas', 'magic'
   Predictions
-.card-deck.mx-auto.predictions
+.index-cards.facts
   - unless crop.perennial.nil?
-    .col
-      .card.predictions-card
-        .card-body.text-center
-          %h3
-            = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
-              - if crop.perennial == true
-                Perennial
-              - elsif crop.perennial == false
-                Annual
+    .card.fact-card
+      .card-body.text-center
+        %h3
+          = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
+            - if crop.perennial == true
+              Perennial
+            - elsif crop.perennial == false
+              Annual
 
-          %p.display-1
-            %i.far.fa-calendar
+        %strong
+          %i.far.fa-calendar
 
-          - if crop.perennial == true
-            %small living more than two years
-          - elsif crop.perennial == false
-            %small living and reproducing in a single year or less
+        - if crop.perennial == true
+          %small living more than two years
+        - elsif crop.perennial == false
+          %small living and reproducing in a single year or less
 
   - if crop.annual? && crop.median_lifespan.present?
-    .col
-      .card.predictions-card
-        .card-body.text-center
-          %h3 Median lifespan
-          %p.display-1= crop.median_lifespan
-          %i.fas.fa-sun-o.fa-5x.pt-3.amber-text
-          %span days
+    .card.fact-card
+      .card-body.text-center
+        %h3 Median lifespan
+        %strong= crop.median_lifespan
+        %i.fas.fa-sun-o.fa-5x.pt-3.amber-text
+        %span days
 
 
   - if crop.median_days_to_first_harvest.present?
-    .col
-      .card.predictions-card
-        .card-body.text-center
-          %h3 First harvest expected
-          %p.display-1= crop.median_days_to_first_harvest
-          %span days after planting
+    .card.fact-card
+      .card-body.text-center
+        %h3 First harvest expected
+        %strong= crop.median_days_to_first_harvest
+        %span days after planting
 
   - if crop.annual? && crop.median_days_to_last_harvest.present?
-    .col
-      .card.predictions-card
-        .card-body.text-center
-          %h3 Last harvest expected
-          %p.display-1= crop.median_days_to_last_harvest
-          %span days after planting
+    = render 'layouts/fact_card',
+      title: "Last harvest expected",
+      value: crop.median_days_to_last_harvest,
+      description: "days after planting"
 
+  - if crop.height.present?
+    = render 'layouts/fact_card',
+      title: 'Height', value: "#{crop.height}cm", description: nil
+
+  - if crop.spread.present?
+    = render 'layouts/fact_card',
+      title: 'Spread', value: "#{crop.spread}cm", description: nil
+
+  - if crop.row_spacing.present?
+    = render 'layouts/fact_card',
+      title: 'Row Spacing', value: "#{crop.row_spacing}cm", description: nil
+  - if crop.growing_degree_days.present?
+    = render 'layouts/fact_card',
+      title: 'Growing Degree Days', value: crop.growing_degree_days, description: nil
diff --git a/app/views/crops/_scientific_names.html.haml b/app/views/crops/_scientific_names.html.haml
index 66036e198..bf6ace250 100644
--- a/app/views/crops/_scientific_names.html.haml
+++ b/app/views/crops/_scientific_names.html.haml
@@ -3,22 +3,20 @@
   - if crop.scientific_names.empty?
     %p None known.
   - else
-    %ul.list-group.list-group-flush
-      - crop.scientific_names.each do |sn|
-        %li.list-group-item.d-flex.justify-content-between.align-items-center
-          - if can? :edit, sn
-            .dropdown.planting-actions
-              %a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
-              .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
-                = link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
-                  = edit_icon
-                  = t('.edit')
-                .dropdown-divider
-                = link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
-                  = delete_icon
-                  = t('.delete')
-          - else
-            = sn.name
+    - crop.scientific_names.each do |sn|
+      - if can? :edit, sn
+        .dropdown.planting-actions
+          %a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
+          .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
+            = link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
+              = edit_icon
+              = t('.edit')
+            .dropdown-divider
+            = link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
+              = delete_icon
+              = t('.delete')
+      - else
+        .badge= sn.name
 
   %p.text-right
     - if can? :edit, crop
diff --git a/app/views/crops/_thumbnail.html.haml b/app/views/crops/_thumbnail.html.haml
index 3b1988283..39559e29c 100644
--- a/app/views/crops/_thumbnail.html.haml
+++ b/app/views/crops/_thumbnail.html.haml
@@ -1,10 +1,11 @@
-.card.card-crop
-  .crop-image
-    = link_to image_tag(crop_image_path(crop, full_size: true),
-                          alt: crop.name,
-                          class: 'img img-card'),
-                          crop
+.card.crop-thumbnail
+  = link_to image_tag(crop_image_path(crop),
+                        alt: crop.name,
+                        class: 'img img-card'),
+                        crop
 
-  .card-body
-    %h3.text-center.crop-name= link_to crop, crop
-    %p.small.crop-sci-name.text-center= crop.default_scientific_name
+  .text
+    %h3.crop-name= link_to crop, crop
+    %h5.crop-sci-name
+      &nbsp;
+      = crop.default_scientific_name
diff --git a/app/views/crops/_tiny.html.haml b/app/views/crops/_tiny.html.haml
index 4e18c5871..8b948a9cc 100644
--- a/app/views/crops/_tiny.html.haml
+++ b/app/views/crops/_tiny.html.haml
@@ -1,6 +1,7 @@
 - if crop.approved? || can?(:wrangle, Crop)
   .crop-chip
     = link_to crop do
+      = crop_icon(crop)
       = crop.name
     - unless crop.approved?
       %badge.badge-warning= crop.approval_status
diff --git a/app/views/crops/_varieties.html.haml b/app/views/crops/_varieties.html.haml
index 2b3407388..e4a8b5f22 100644
--- a/app/views/crops/_varieties.html.haml
+++ b/app/views/crops/_varieties.html.haml
@@ -1,5 +1,5 @@
 - if crop.varieties.size.positive?
-  %h3 Varieties
-  .row
+  %h2 Varieties
+  .index-cards
     - crop.varieties.order(:name).each do |v|
-      .col-md-2.six-across= render 'crops/thumbnail', crop: v
\ No newline at end of file
+      = render 'crops/thumbnail', crop: v
\ No newline at end of file
diff --git a/app/views/crops/_wrangle.html.haml b/app/views/crops/_wrangle.html.haml
index 7cedc4ca3..6c93c734d 100644
--- a/app/views/crops/_wrangle.html.haml
+++ b/app/views/crops/_wrangle.html.haml
@@ -1,6 +1,5 @@
 - if can?(:edit, crop) || can?(:destroy, crop)
   .alert.alert-success{role: "alert"}
-    %h4 Crop wrangling
     %p
       You are a
       %strong CROP WRANGLER
@@ -11,6 +10,10 @@
           = edit_icon
           = t('.edit')
 
+        = link_to crop_openfarm_path(crop), method: :post, class: 'dropdown-item' do
+          = icon 'far', 'update'
+          Fetch data from OpenFarm
+
         - if can? :destroy, crop
           .dropdown-divider
           = delete_button(crop, classes: 'dropdown-item text-danger')
diff --git a/app/views/crops/index.html.haml b/app/views/crops/index.html.haml
index e0eb151e1..07e0d37b7 100644
--- a/app/views/crops/index.html.haml
+++ b/app/views/crops/index.html.haml
@@ -24,15 +24,14 @@
                label: 'Sort by'
   = f.submit "Show"
 
-.pagination= render 'layouts/pagination', collection: @crops
+= render 'layouts/pagination', collection: @crops
 
 .crops
-  .row
+  .index-cards
     - @crops.each do |crop|
-      .col-6.col-md-3= render 'crops/thumbnail', crop: crop
+      = render 'crops/thumbnail', crop: crop
 
-
-.pagination= render 'layouts/pagination', collection: @crops
+= render 'layouts/pagination', collection: @crops
 
 %ul.list-inline
   %li The data on this page is available in the following formats:
diff --git a/app/views/crops/requested.haml b/app/views/crops/requested.haml
index bd0f1cfd5..931ee3de2 100644
--- a/app/views/crops/requested.haml
+++ b/app/views/crops/requested.haml
@@ -6,10 +6,9 @@
 .pagination
   = will_paginate @requested
 
-.row
+.index-cards
   - @requested.each do |crop|
-    .col-md-2.six-across
-      = render partial: "thumbnail", locals: { crop: crop }
+    = render partial: "thumbnail", locals: { crop: crop }
 
 .pagination
   = will_paginate @requested
diff --git a/app/views/crops/search.html.haml b/app/views/crops/search.html.haml
index 1312f5d50..45610b70d 100644
--- a/app/views/crops/search.html.haml
+++ b/app/views/crops/search.html.haml
@@ -2,25 +2,23 @@
   %li.breadcrumb-item= link_to 'Crops', crops_path
   %li.breadcrumb-item.active= link_to 'Search', search_crops_path(term: @term)
 
-%section.crops-search-form
-
-  - if @term
-    - content_for :title, "Crops matching \"#{@term}\""
-    %h1 Crops matching "#{@term}"
+- if @term
+  - content_for :title, "Crops matching \"#{@term}\""
+  %h1
+    Crops matching "#{@term}"
     - if @crops
-      %h2.text-muted Found #{@crops.size} total
-  - else
-    - content_for :title, "Crop search"
-    %h1 Crop search
+      %span.text-muted Found #{@crops.size} total
+- else
+  - content_for :title, "Crop search"
+  %h1 Crop search
 
-
-  = bootstrap_form_tag(url: search_crops_path, method: :get, html: { id: 'crop-search'}, layout: :inline) do |f|
-    = f.label :term, "Search crops:", class: 'sr-only'
-    = f.text_field 'term', class: 'search-query input-medium',
-                     placeholder: 'Search crops',
-                     label: 'crop',
-                     value: @term
-    = f.submit "Search", class: 'btn btn-success'
+= bootstrap_form_tag(url: search_crops_path, method: :get, html: { id: 'crop-search'}, layout: :inline) do |f|
+  = f.label :term, "Search crops:", class: 'sr-only'
+  = f.text_field 'term', class: 'search-query input-medium',
+                   placeholder: 'Search crops',
+                   label: 'crop',
+                   value: @term
+  = f.submit "Search", class: 'btn btn-success'
 
 - if @crops.empty?
   %h2 No results found
@@ -32,12 +30,11 @@
     instead.
 
 - else
-  .pagination= will_paginate @crops
+  = will_paginate @crops
 
-  .crops
-    .row
-      - @crops.each do |crop|
-        .col-6.col-md-3= render 'crops/thumbnail', crop: crop
+  .index-cards
+    - @crops.each do |crop|
+      = render 'crops/thumbnail', crop: crop
 
 
-  .pagination= will_paginate @crops
+  = will_paginate @crops
diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index 131ab483a..68e841383 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -33,12 +33,13 @@
       = image_tag crop_image_path(@crop),
         class: 'img-responsive shadow rounded crop-hero-photo', alt: 'photo of crop'
 
+.jumbotron= render 'crops/info'
+
 .row
   .col-md-9
-    = render 'crops/actions', crop: @crop
+    %p= render 'crops/actions', crop: @crop
   .col-md-3
     = render 'wrangle', crop: @crop
-
 .row
   .col-md-9
     %section.prediction= render 'predictions', crop: @crop
diff --git a/app/views/follows/followers.html.haml b/app/views/follows/followers.html.haml
index 3262de360..f6a005797 100644
--- a/app/views/follows/followers.html.haml
+++ b/app/views/follows/followers.html.haml
@@ -1,12 +1,11 @@
 - content_for :title, "#{@member.login_name}'s followers"
 
-
-%h1.page-title #{@member.login_name}'s followers
-
 = page_entries_info @followers
 = will_paginate @followers
 
-.index-cards= render @followers
+.index-cards
+  - @followers.each do |f|
+    .thumbnail= render partial: "members/thumbnail", locals: { member: f }
 
 = page_entries_info @followers
 = will_paginate @followers
diff --git a/app/views/garden_types/index.html.haml b/app/views/garden_types/index.html.haml
index 49352bc4c..d40e16ae9 100644
--- a/app/views/garden_types/index.html.haml
+++ b/app/views/garden_types/index.html.haml
@@ -4,10 +4,9 @@
   #{ENV['GROWSTUFF_SITE_NAME']} tracks who's growing what, where.
   View any garden_type page to see which of our members have used it.
 
-.row
+.index-cards
   - @garden_types.each do |garden_type|
-    .col-md-2.six-across
-      = render partial: "thumbnail", locals: { garden_type: garden_type }
+    = render partial: "thumbnail", locals: { garden_type: garden_type }
 
 - if can? :create, GardenType
   %div
diff --git a/app/views/gardens/_actions.html.haml b/app/views/gardens/_actions.html.haml
index 715dcdf38..554d7e3fa 100644
--- a/app/views/gardens/_actions.html.haml
+++ b/app/views/gardens/_actions.html.haml
@@ -1,5 +1,5 @@
 - if can?(:edit, garden)
-  .dropdown.float-right.garden-actions
+  .dropdown.garden-actions
     %a#garden-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "garden-actions-button"}
       - if can?(:edit, garden)
diff --git a/app/views/gardens/_garden.html.haml b/app/views/gardens/_garden.html.haml
new file mode 100644
index 000000000..bba2a0ee4
--- /dev/null
+++ b/app/views/gardens/_garden.html.haml
@@ -0,0 +1,5 @@
+.card
+  = link_to garden do
+    = image_tag garden_image_path(garden), class: 'img-card', alt: garden
+    .card-body.text-center
+      %h4.card-title= garden.name
\ No newline at end of file
diff --git a/app/views/gardens/index.html.haml b/app/views/gardens/index.html.haml
index 0515ad7ef..ce0d67833 100644
--- a/app/views/gardens/index.html.haml
+++ b/app/views/gardens/index.html.haml
@@ -1,8 +1,7 @@
 - content_for :title, @owner ? "#{@owner}'s gardens" : "Everyone's gardens"
 
 
-%h1
-  = @owner ? "#{@owner}'s gardens" : "Everyone's gardens"
+%h1= @owner ? "#{@owner}'s gardens" : "Everyone's gardens"
 
 = render 'layouts/nav', model: Garden
 
@@ -24,26 +23,19 @@
     = link_to 'Add a garden', new_garden_path, class: 'btn btn-primary'
 
 - else
-  .row
-    .col-12= page_entries_info @gardens
-    .col-12= will_paginate @gardens
+  = page_entries_info @gardens
+  = will_paginate @gardens
   - @gardens.each do |garden|
-    %section.border-top
-      .row
-        .col-md-2.border-right
-          %h2
-            %strong= link_to garden, garden
-            = render 'gardens/actions', garden: garden
-          %p
-            = pluralize(garden.plantings.active.size, "planting")
-        .col-md-10
-          .row
-            - if garden.plantings.empty?
-              = garden_plant_something_button(garden, classes: 'btn btn-success')
-            - else
-              - garden.plantings.active.each do |planting|
-                .col-6.col-md-4.col-lg-3= render 'plantings/card', planting: planting
-
+    %section
+      %h2
+        = link_to garden.name, garden
+      = render 'gardens/actions', garden: garden
+      - if garden.plantings.any?
+        .index-cards
+          - garden.plantings.active.each do |planting|
+            = render planting, full: true
+      - else
+        No plantings
 
   .row
     .col-12= page_entries_info @gardens
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index cc97c141f..ae51892fa 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -46,14 +46,15 @@
                 Why not
                 = link_to 'tell us more.', edit_garden_path(@garden)
 
-    .row
-      .col-md-12
-        %section
-          %h3 Garden timeline
-          = timeline garden_timeline_path(@garden), adapter: "google"
+    - if @garden.plantings.where.not(planted_at: nil).any?
+      .row
+        .col-md-12
+          %section
+            %h2 Garden timeline
+            = timeline garden_timeline_path(@garden), adapter: "google"
 
     %section
-      %h3.h3 Current plantings in garden
+      %h2 Current plantings in garden
       .index-cards
         - if @current_plantings.size.positive?
           - @current_plantings.each do |planting|
@@ -62,7 +63,7 @@
           .col-md-12
             %p Nothing is currently planted here.
     %section
-      %h3.h3 Previously planted in this garden
+      %h2 Previously planted in this garden
       .index-cards
         - if @finished_plantings.size.positive?
           - @finished_plantings.each do |planting|
@@ -72,7 +73,7 @@
   .col-md-3
     .card
       .card-image
-        = image_tag garden_image_path(@garden, full_size: true), class: 'img-card', alt: 'photo of this garden'
+        = image_tag garden_image_path(@garden), class: 'img-card', alt: 'photo of this garden'
       .card-body
         %h4 About this garden
         %p
@@ -86,7 +87,7 @@
           %p
             %strong Area:
             = pluralize(@garden.area, @garden.area_unit)
-    %hr/
+
     .card
       .card-header
         %h4 #{@garden.owner}'s gardens
@@ -120,7 +121,8 @@
         = add_photo_button(@garden)
 
     - if @garden.photos.size.positive?
-      %h3= localize_plural(@garden.photos, Photo)
-      .row
-        - @garden.photos.includes(:owner).each do |photo|
-          .col-xs-6= render 'photos/thumbnail', photo: photo
+      %section.photos
+        %h2= localize_plural(@garden.photos, Photo)
+        .index-cards
+          - @garden.photos.includes(:owner).each do |photo|
+            = render 'photos/thumbnail', photo: photo
diff --git a/app/views/harvests/_actions.html.haml b/app/views/harvests/_actions.html.haml
index 7cb6ca9a0..cafe42811 100644
--- a/app/views/harvests/_actions.html.haml
+++ b/app/views/harvests/_actions.html.haml
@@ -1,6 +1,6 @@
 - if can?(:edit, harvest)
-  .dropdown.float-right.harvest-actions
-    %a#harvest-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'} Actions
+  .dropdown.harvest-actions
+    %a#harvest-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "harvest-actions-button"}
       = harvest_edit_button(harvest, classes: 'dropdown-item')
       = add_photo_button(harvest, classes: 'dropdown-item')
diff --git a/app/views/harvests/_card.html.haml b/app/views/harvests/_card.html.haml
index 2cb4ff07b..51d077338 100644
--- a/app/views/harvests/_card.html.haml
+++ b/app/views/harvests/_card.html.haml
@@ -1,17 +1,16 @@
 .card
   = link_to harvest do
-    = image_tag harvest_image_path(harvest, full_size: true), alt: harvest, class: 'img-card'
+    = image_tag harvest_image_path(harvest), alt: harvest, class: 'img-card'
   .card-body
     %h5
-      %strong= link_to "#{harvest.crop} #{harvest.plant_part}", harvest
-    %span.badge.badge-pill.badge-info= link_to harvest.plant_part, harvest.plant_part
-
+      = crop_icon(harvest.crop)
+      %strong
+        = link_to harvest.crop, harvest
+      %span.badge.badge-pill= link_to harvest.plant_part, harvest.plant_part
     - if harvest.planting.present?
       %p.card-text
         %small.text-muted
           Harvested from
           = link_to harvest.planting, harvest.planting
   .card-footer
-    %p
-      .float-left= link_to harvest.owner, harvest.owner
-      .float-right=render 'members/tiny', member: harvest.owner
\ No newline at end of file
+    .float-right=render 'members/tiny', member: harvest.owner
\ No newline at end of file
diff --git a/app/views/harvests/_owner.html.haml b/app/views/harvests/_owner.html.haml
index f51da33f8..977743c15 100644
--- a/app/views/harvests/_owner.html.haml
+++ b/app/views/harvests/_owner.html.haml
@@ -1,18 +1,19 @@
-.well
-  .row
-    .col-md-6
-      %h4
-        Harvested by
-        = link_to harvest.owner, harvest.owner
-      = link_to "view all #{harvest.owner}'s harvests", member_gardens_path(harvest.owner)
+.card
+  .card-body
+    .row
+      .col-md-6
+        %h4
+          Harvested by
+          = link_to harvest.owner, harvest.owner
+        = link_to "view all #{harvest.owner}'s harvests", member_harvests_path(harvest.owner)
 
-      - if harvest.planting.present?
-        %p
-          Harvested from
-          = link_to harvest.planting, harvest.planting
-      - if harvest.owner.location
-        %p
-          %small
-            View other harvests, members and more near
-            = link_to harvest.owner.location, place_path(harvest.owner.location, anchor: "harvests")
-    .col-md-6= render "members/avatar", member: harvest.owner
\ No newline at end of file
+        - if harvest.planting.present?
+          %p
+            Harvested from
+            = link_to harvest.planting, harvest.planting
+        - if harvest.owner.location
+          %p
+            %small
+              View other harvests, members and more near
+              = link_to harvest.owner.location, place_path(harvest.owner.location, anchor: "harvests")
+      .col-md-6= render "members/avatar", member: harvest.owner
\ No newline at end of file
diff --git a/app/views/harvests/_planting.haml b/app/views/harvests/_planting.haml
index ae2d94b9c..5e1eaafe8 100644
--- a/app/views/harvests/_planting.haml
+++ b/app/views/harvests/_planting.haml
@@ -1,15 +1,7 @@
-- if @harvest.planting
-  = link_to "#{@harvest.planting.crop.name} planted on #{@harvest.planting.planted_at}",
-    planting_path(@harvest.planting)
-  in
-  = link_to @harvest.planting.garden, garden_path(@harvest.planting.garden)
-- elsif @matching_plantings && @matching_plantings.any? && @harvest.owner == current_member
-
+- if @harvest.planting.nil? && @matching_plantings && @matching_plantings.any? && @harvest.owner == current_member
   .alert.alert-info{role: "alert"}
     = bootstrap_form_for(@harvest) do |f|
       Is this from one of these plantings?
       - @matching_plantings.each do |planting|
         = f.radio_button :planting_id, planting.id, label: planting
       = f.submit "save", class: 'btn btn-sm'
-- else
-  Unknown
diff --git a/app/views/harvests/index.html.haml b/app/views/harvests/index.html.haml
index 3434f4e92..527ce0e56 100644
--- a/app/views/harvests/index.html.haml
+++ b/app/views/harvests/index.html.haml
@@ -32,13 +32,11 @@
   = page_entries_info @harvests
   = will_paginate @harvests
 
-  %ul.list-inline
-    %li The data on this page is available in the following formats:
-    - if @owner
-      %li= link_to "RSS", member_harvests_path(@owner, format: 'rss')
-      %li= link_to "CSV", member_harvests_path(@owner, format: 'csv')
-      %li= link_to "JSON", member_harvests_path(@owner, format: 'json')
-    - else
-      %li= link_to "RSS", harvests_path(format: 'rss')
-      %li= link_to "CSV", harvests_path(format: 'csv')
-      %li= link_to "JSON", harvests_path(format: 'json')
+%section.open-data
+  %h5= t('label.data')
+  %ul.nav#open-data
+    - ['csv', 'json', 'rss'].each do |format|
+      %li.list-group-item
+        = link_to (@owner ? member_harvests_path(@owner, format: format) : harvests_path(format: format)) do
+          = icon 'fas', format.to_s
+          = format.upcase
\ No newline at end of file
diff --git a/app/views/harvests/show.html.haml b/app/views/harvests/show.html.haml
index 116a7ec84..cc68a79bd 100644
--- a/app/views/harvests/show.html.haml
+++ b/app/views/harvests/show.html.haml
@@ -8,46 +8,48 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
+- content_for :breadcrumbs do
+  %li.breadcrumb-item= link_to 'Harvests', harvests_path
+  %li.breadcrumb-item= link_to @harvest.owner, member_harvests_path(@harvest.owner)
+  %li.breadcrumb-item.active= link_to @harvest, @harvest
+
 .row
   .col-md-8
     %h1
       = harvest_icon
       #{@harvest.crop} harvested by #{@harvest.owner}
     = render 'harvests/actions', harvest: @harvest
-    = link_to "view all #{@harvest.owner}'s harvests >>", member_harvests_path(@harvest.owner), class: 'btn'
-    .index-cards.planting-facts
+    = render partial: 'planting'
+    .index-cards.facts
       - if @harvest.plant_part
-        .card.planting-fact-card
+        .card
           %h3 Plant part
           %span= link_to @harvest.plant_part, @harvest.plant_part
       - if @harvest.harvested_at.present?
-        .card.planting-fact-card
+        .card
           %h3 Harvested
-          = @harvest.harvested_at
-
-      .card.planting-fact-card
-        %h3 Planting
-        = render partial: 'planting'
-      .card.planting-fact-card
+          %strong= I18n.l @harvest.harvested_at
+      .card
         %h3 Quantity
-        %span= display_quantity(@harvest)
-
-
-  .col-md-4
-    .card
-      .card-body= render 'harvests/owner', harvest: @harvest
-
-    = render @harvest.crop
-
-    %hr/
+        %strong= display_quantity(@harvest)
     - if @harvest.photos.size.positive?
-      .row
-        .col-md-6= render @harvest.default_photo
-        .col-md-6
-          = render 'photos/gallery', photos: @harvest.photos.order(date_taken: :desc).limit(3).offset(1)
-          %p.text-right= link_to 'View all photos >>', harvest_photos_path(@harvest), class: 'btn'
-  .col-md-4
-    .card
-      .card-body= render 'harvests/owner', harvest: @harvest
+      %section
+        %h2 Photos
+        = render 'photos/gallery', photos: @harvest.photos.order(date_taken: :desc).limit(3)
+    %section.harvest-detail
+      %h2 Detail
+      - if @harvest.planting.present?
+        Havested from
+        = link_to @harvest.planting, @harvest.planting
 
-    = render @harvest.crop
\ No newline at end of file
+    - if @harvest.description.present?
+      .card
+        .card-header
+          %h2 Notes
+        .card-body
+          :growstuff_markdown
+            #{strip_tags(@harvest.description)}
+
+  .col-md-4
+    = render 'harvests/owner', harvest: @harvest
+    = render @harvest.crop
diff --git a/app/views/home/_blurb.html.haml b/app/views/home/_blurb.html.haml
index 9c942acad..11582e8b6 100644
--- a/app/views/home/_blurb.html.haml
+++ b/app/views/home/_blurb.html.haml
@@ -1,6 +1,6 @@
 .row
   .col-md-8.info
-    %h1= ENV['GROWSTUFF_SITE_NAME']
+    %h1.display-1= ENV['GROWSTUFF_SITE_NAME']
     %p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME'])
     = render 'stats'
   .col-md-4
diff --git a/app/views/home/_crops.html.haml b/app/views/home/_crops.html.haml
index 974abdb63..9a6d9d658 100644
--- a/app/views/home/_crops.html.haml
+++ b/app/views/home/_crops.html.haml
@@ -1,6 +1,5 @@
 - cache cache_key_for(Crop, 'homepage'), expires_in: 1.day do
-  .row
+  .index-cards
     - Crop.interesting.includes(:scientific_names, :photos).shuffle.first(12).each do |crop|
-      .col-6.col-md-3
-        = render 'crops/thumbnail', crop: crop
+      = render 'crops/thumbnail', crop: crop
 
diff --git a/app/views/home/_harvests.html.haml b/app/views/home/_harvests.html.haml
index aab9c71d4..05948de40 100644
--- a/app/views/home/_harvests.html.haml
+++ b/app/views/home/_harvests.html.haml
@@ -1,12 +1,10 @@
-%section.harvests
-  %h5= t('.recently_harvested')
-  - Harvest.has_photos.recent.includes(:crop, :owner, :photos).limit(6).each do |harvest|
-    .card
-      = link_to harvest, class: 'list-group-item list-group-item-action flex-column align-items-start' do
-        .d-flex.w-100.justify-content-between
-          %div
-            %h5.mb-2.h5= harvest.crop.name
-            %span.badge.badge-success=harvest.plant_part
-            %small.text-muted
-              harvested by #{harvest.owner}
-          %p.mb-2= image_tag harvest_image_path(harvest), width: 75, class: 'rounded shadow'
\ No newline at end of file
+%h2= t('.recently_harvested')
+- Harvest.has_photos.recent.includes(:crop, :owner, :photos).limit(6).each do |harvest|
+  = link_to harvest, class: 'list-group-item list-group-item-action flex-column align-items-start' do
+    .d-flex.w-100.justify-content-between.homepage--list-item
+      %div
+        %h5= harvest.crop.name
+        %span.badge.badge-success=harvest.plant_part
+        %small.text-muted
+          harvested by #{harvest.owner}
+      %p.mb-2= image_tag harvest_image_path(harvest), width: 75, class: 'rounded shadow'
\ No newline at end of file
diff --git a/app/views/home/_members.html.haml b/app/views/home/_members.html.haml
index 90d4c7078..1dcb960b2 100644
--- a/app/views/home/_members.html.haml
+++ b/app/views/home/_members.html.haml
@@ -3,7 +3,7 @@
     - members = Member.includes(plantings: :crop).interesting.limit(6)
     - if members.present?
       %h2.text-center= t('.title')
-      .member-cards.index-cards
+      .index-cards
         = render members
 
     %p.text-right
diff --git a/app/views/home/_plantings.html.haml b/app/views/home/_plantings.html.haml
index c06951ada..a148a05fe 100644
--- a/app/views/home/_plantings.html.haml
+++ b/app/views/home/_plantings.html.haml
@@ -1,13 +1,12 @@
-%section.plantings
-  %h5= t('.recently_planted')
+%h2= t('.recently_planted')
 
-  - Planting.has_photos.recent.includes(:crop, garden: :owner).limit(6).each do |planting|
-    .card.planting-card
-      = link_to planting, class: 'list-group-item list-group-item-action flex-column align-items-start' do
-        .d-flex.w-100.justify-content-between
-          %p.mb-2= image_tag planting_image_path(planting), width: 75, class: 'rounded shadow'
-          .text-right
-            %h5.mb-2.h5= planting.crop.name
-            - if planting.planted_from.present?
-              %span.badge.badge-success= planting.planted_from.pluralize
-            %small.text-muted= display_planting(planting)
\ No newline at end of file
+- Planting.has_photos.recent.includes(:crop, garden: :owner).limit(6).each do |planting|
+  = link_to planting, class: 'list-group-item list-group-item-action flex-column align-items-start' do
+    .d-flex.w-100.justify-content-between.homepage--list-item
+      %p.mb-2
+        = image_tag planting_image_path(planting), width: 75, class: 'rounded shadow'
+      .text-right
+        %h5= planting.crop.name
+        - if planting.planted_from.present?
+          %span.badge.badge-success= planting.planted_from.pluralize
+        %small.text-muted planted by #{planting.owner}
\ No newline at end of file
diff --git a/app/views/home/_seeds.html.haml b/app/views/home/_seeds.html.haml
index bff02e70d..38ae29fd9 100644
--- a/app/views/home/_seeds.html.haml
+++ b/app/views/home/_seeds.html.haml
@@ -1,5 +1,5 @@
 - cache cache_key_for(Seed) do
   %h2.text-center= t('home.seeds.title')
-  .homepage-cards
+  .index-cards
     - Seed.current.tradable.includes(:owner, :crop).order(created_at: :desc).limit(6).each do |seed|
       = render 'seeds/card', seed: seed
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index dd748925f..3b027c956 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -2,35 +2,38 @@
   = ENV['GROWSTUFF_SITE_NAME']
 
 - if member_signed_in?
-  %h1.display-5= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
+  %h1.display-2= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
 
   %p= render 'stats'
 - else
   .hidden-xs
-    .jumbotron= render 'blurb'
+    %section.jumbotron= render 'blurb'
 
 .row
-  .col-xl-8.col-md-12
+  .col-lg-8.col-md-12
     %section.crops
       %h2= t('home.crops.our_crops')
-      .homepage-cards= render 'crops'
-      .align-bottom
-        %p.text-right= link_to "#{t('home.crops.view_all')} »", crops_path, class: 'btn btn-block'
-        - cache cache_key_for(Crop, 'recent') do
-          %h3= t('.recently_added')
+      = render 'crops'
+      = link_to "#{t('home.crops.view_all')} »", crops_path, class: 'btn btn-block'
+    %section.recent-crops
+      - cache cache_key_for(Crop, 'recent') do
+        %h2= t('.recently_added')
+        %p
           != Crop.recent.limit(30).map { |c| link_to(c, c) }.join(", ")
-  .col-xl-4
-    .row
-      .col-md-6
-        =render 'plantings'
-        %p.text-right= link_to "#{t('home.plantings.view_all')} »", plantings_path, class: 'btn btn-block'
-      .col-md-6
-        = render 'harvests'
-        %p.text-right= link_to "#{t('home.harvests.view_all')} »", harvests_path, class: 'btn btn-block'
-  .col-md-6
-    %section.seeds.mx-auto
+
+  .col-xl-2.col
+    %section.plantings
+      =render 'plantings'
+      %p.text-right= link_to "#{t('home.plantings.view_all')} »", plantings_path, class: 'btn btn-block'
+  .col-xl-2.col
+    %section.harvests
+      = render 'harvests'
+      %p.text-right= link_to "#{t('home.harvests.view_all')} »", harvests_path, class: 'btn btn-block'
+  .col-12.col-md-6
+    %section.seeds
       = render 'seeds'
       %p.text-right= link_to "#{t('home.seeds.view_all')} »", seeds_path, class: 'btn btn-block'
-  .col-md-6
-    %section.members.mx-auto= render 'members'
-  %section.discussion.mx-auto= render 'discuss'
\ No newline at end of file
+  .col-12.col-md-6
+    %section.discussion= render 'discuss'
+  .col-12
+    %section.members= render 'members'
diff --git a/app/views/layouts/_fact_card.haml b/app/views/layouts/_fact_card.haml
new file mode 100644
index 000000000..daaa36468
--- /dev/null
+++ b/app/views/layouts/_fact_card.haml
@@ -0,0 +1,6 @@
+.card.fact-card
+  .card-body.text-center
+    %h3= title
+    %strong= value
+    - if description.present?
+      %span= description
\ No newline at end of file
diff --git a/app/views/layouts/_nav.haml b/app/views/layouts/_nav.haml
index 6af1aaa10..07477f19a 100644
--- a/app/views/layouts/_nav.haml
+++ b/app/views/layouts/_nav.haml
@@ -1,14 +1,17 @@
-- content_for :buttonbar do
+%ul.nav
   - if current_member.present?
-    = link_to url_for([current_member, model]), class: 'btn' do
-      My #{model.model_name.human.pluralize}
+    %li.list-group-item.btn
+      = link_to url_for([current_member, model]) do
+        My #{model.model_name.human.pluralize}
 
-  = link_to model, class: 'btn' do
-    Everyone's #{model.model_name.human.pluralize}
+  %li.list-group-item.btn
+    = link_to model do
+      Everyone's #{model.model_name.human.pluralize}
 
   - if can?(:create, model)
-    = link_to url_for([model, action: :new]), class: 'btn' do
-      Add a #{model.model_name.human}
+    %li.list-group-item.btn
+      = link_to url_for([model, action: :new]) do
+        Add a #{model.model_name.human}
 
 - unless current_member
   = render 'shared/signin_signup', to: "add a new #{model.to_s.downcase}"
diff --git a/app/views/layouts/_pagination.html.haml b/app/views/layouts/_pagination.html.haml
index 186c6b32e..a57470a4b 100644
--- a/app/views/layouts/_pagination.html.haml
+++ b/app/views/layouts/_pagination.html.haml
@@ -1 +1 @@
-= will_paginate collection, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
\ No newline at end of file
+= will_paginate collection
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0cfbdd58e..a378fc735 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -7,10 +7,10 @@
     = render "layouts/header"
     -# anchor tag for accessibility link to skip the navigation menu
     %a{ name: 'skipnav' }
-    #maincontainer.container
+    #maincontainer.container-fluid
       .row
         .col-12
-          .float-right= render 'shared/global_actions'
+          .layout-actions= render 'shared/global_actions'
           - if content_for?(:breadcrumbs)
             .float-left
               %nav{"aria-label" => "breadcrumb"}
@@ -19,7 +19,7 @@
                   = yield(:breadcrumbs)
 
           - if content_for?(:buttonbar)
-            .layout-actions.float-right= yield(:buttonbar)
+            = yield(:buttonbar)
 
       - if content_for?(:subtitle)
         %small= yield(:subtitle)
diff --git a/app/views/members/_location.html.haml b/app/views/members/_location.html.haml
index 3b9a2f647..7c08e6acb 100644
--- a/app/views/members/_location.html.haml
+++ b/app/views/members/_location.html.haml
@@ -1,6 +1,8 @@
-%span.badge.badge-light.member-location
-  - if member.location.blank?
-    unknown location
-  - else
-    = link_to place_path(member.location, anchor: "members") do
-      = truncate(member.location, length: 40, separator: ' ', omission: '... ')
+- if member.location.present?
+  = link_to place_path(member.location) do
+    %span.badge.badge-location
+      = icon 'fas', 'map-marker'
+      = truncate(member.location, length: 15, separator: ' ', omission: '... ')
+- else
+  %span.badge.badge-location
+    unknown location
\ No newline at end of file
diff --git a/app/views/members/_member.haml b/app/views/members/_member.haml
index 2274a8e5c..7c10ce280 100644
--- a/app/views/members/_member.haml
+++ b/app/views/members/_member.haml
@@ -11,9 +11,7 @@
           = distance_of_time_in_words(member.created_at, Time.zone.now)
           ago.
       - if member.location.present?
-        %span.badge.badge-success
-          = icon 'fas', 'map-marker'
-          = truncate(member.location, length: 50, separator: ' ', omission: '... ')
+        = render 'members/location', member: member
 
       %p
         %ul.nav.nav-justified.small
diff --git a/app/views/members/_tiny.haml b/app/views/members/_tiny.haml
index dcd4e9987..4693bf373 100644
--- a/app/views/members/_tiny.haml
+++ b/app/views/members/_tiny.haml
@@ -1,4 +1,4 @@
-.member-chip
+%span.member-chip
   - if member.discarded?
     = icon 'fas', 'user-times'
     = member
diff --git a/app/views/members/nearby.html.haml b/app/views/members/nearby.html.haml
index 2d9750c3e..57949ddec 100644
--- a/app/views/members/nearby.html.haml
+++ b/app/views/members/nearby.html.haml
@@ -17,9 +17,8 @@
 
 - if !@nearby_members.empty?
   %h3 Results found
-  .row
+  .index-cards
     - @nearby_members.each do |member|
-      .col-md-4.three-across
-        = render partial: "members/thumbnail", locals: { member: member }
+      = render partial: "members/thumbnail", locals: { member: member }
 - elsif @location
   %h3 No results found
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 5e1192c31..693a61d2a 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -20,9 +20,9 @@
           - @member.roles.each do |role|
             %span.badge.badge-info= role.name.titleize
         - if @member.location.present?
-          %p.badge.badge-success
+          %p.badge.badge-location
             = icon 'fas', 'map-marker'
-            = @member.location
+            = truncate(@member.location, length: 25, separator: ' ', omission: '... ')
         %p
           %strong Member since
           = @member.created_at.to_s(:date)
@@ -56,18 +56,19 @@
                                               facebook_auth: @facebook_auth
 
   .col-md-10
-    = render "map", member: @member
-    %h2 Activity
-    .list-group
-      - @activity.each do |event|
-        .list-group-item.list-group-item-action.flex-column.align-items-start{:href => "#!"}
-          .d-flex.w-100.justify-content-between
-            %h5
-              = icon_for_model(event.event_type)
-              = event_description(event)
-              = render 'timeline/photos', photo: resolve_model(event) if event.event_type == 'photo'
-            %small
-            - if event.event_at.present?
-              #{time_ago_in_words(event.event_at)} ago
-            - else
-              unknown date
+    %section= render "map", member: @member
+    %section.activity
+      %h2 Activity
+      .list-group
+        - @activity.each do |event|
+          .list-group-item.list-group-item-action.flex-column.align-items-start{:href => "#!"}
+            .d-flex.w-100.justify-content-between
+              %h5
+                = icon_for_model(event.event_type)
+                = event_description(event)
+                = render 'timeline/photos', photo: resolve_model(event) if event.event_type == 'photo'
+              %small
+              - if event.event_at.present?
+                #{time_ago_in_words(event.event_at)} ago
+              - else
+                unknown date
diff --git a/app/views/photos/_card.html.haml b/app/views/photos/_card.html.haml
index d16324610..f073cbef1 100644
--- a/app/views/photos/_card.html.haml
+++ b/app/views/photos/_card.html.haml
@@ -1,10 +1,11 @@
 .card.photo-card{id: "photo-#{photo.id}"}
   = link_to image_tag(photo.source == 'flickr' ? photo.fullsize_url : photo.thumbnail_url, alt: photo.title, class: 'img img-card'), photo
   .card-body
-    %h5.ellipsis= link_to photo.title, photo
+    %h5.ellipsis
+      = photo_icon
+      = link_to photo.title, photo
     %i by #{link_to photo.owner, photo.owner}
     - if photo.date_taken.present?
-      %small
-        %time{datetime: photo.date_taken}
-          = I18n.l(photo.date_taken.to_date)
+      %small.text-muted
+        %time{datetime: photo.date_taken}= I18n.l(photo.date_taken.to_date)
     = render 'photos/likes', photo: photo
diff --git a/app/views/photos/_gallery.haml b/app/views/photos/_gallery.haml
index 98bed3450..e48872d81 100644
--- a/app/views/photos/_gallery.haml
+++ b/app/views/photos/_gallery.haml
@@ -1,4 +1,4 @@
 .index-cards
   - photos.each do |photo|
-    .photo-grid-item= render 'photos/card', photo: photo
+    = render 'photos/card', photo: photo
 
diff --git a/app/views/photos/_hero.html.haml b/app/views/photos/_hero.html.haml
new file mode 100644
index 000000000..b269e4431
--- /dev/null
+++ b/app/views/photos/_hero.html.haml
@@ -0,0 +1,7 @@
+.photo.hero.jumbotron
+  .row
+    .col-6
+      = image_tag(photo.fullsize_url, alt: photo.title, class: 'img img-responsive hero-photo')
+    .col-6
+      %h3= link_to photo.title, photo
+      Taken on #{I18n.l photo.date_taken}
diff --git a/app/views/photos/_item_photos.haml b/app/views/photos/_item_photos.haml
deleted file mode 100644
index 05a2f8319..000000000
--- a/app/views/photos/_item_photos.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-%h2 Photos
-
-- if photos.size.positive? || (can?(:edit, item) && can?(:create, Photo))
-  - if photos.size.positive?
-    = page_entries_info photos
-    = will_paginate photos
-    .row
-      - photos.each do |photo|
-        .col-xs-6.col-md-3.six-across= render 'photos/thumbnail', photo: photo
-
-= add_photo_button(item)
diff --git a/app/views/photos/_likes.html.haml b/app/views/photos/_likes.html.haml
index 47cca8634..fb0b0e918 100644
--- a/app/views/photos/_likes.html.haml
+++ b/app/views/photos/_likes.html.haml
@@ -1,13 +1,14 @@
-- if member_signed_in?
-  - if can?(:new, Like) && !photo.liked_by?(current_member)
-    = link_to likes_path(photo_id: photo.id, format: :json),
-              method: :post, remote: true, class: 'photo-like like-btn' do
-      = render 'likes/count', likeable: photo
-  - else
-    - like = photo.likes.find_by(member: current_member)
-    - if like && can?(:destroy, like)
-      = link_to like_path(id: like.id, format: :json),
-                method: :delete, remote: true, class: 'photo-like like-btn' do
+%span.likes
+  - if member_signed_in?
+    - if can?(:new, Like) && !photo.liked_by?(current_member)
+      = link_to likes_path(photo_id: photo.id, format: :json),
+                method: :post, remote: true, class: 'photo-like like-btn' do
         = render 'likes/count', likeable: photo
-- else
-  = render 'likes/count', likeable: photo
\ No newline at end of file
+    - else
+      - like = photo.likes.find_by(member: current_member)
+      - if like && can?(:destroy, like)
+        = link_to like_path(id: like.id, format: :json),
+                  method: :delete, remote: true, class: 'photo-like like-btn' do
+          = render 'likes/count', likeable: photo
+  - else
+    = render 'likes/count', likeable: photo
\ No newline at end of file
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index 341a8ec7f..bcd42f045 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -1,4 +1,4 @@
-.planting-full-photo
+.photo
   = image_tag(photo.fullsize_url, alt: photo.title, class: 'img img-responsive')
   .text
     %p
diff --git a/app/views/photos/index.html.haml b/app/views/photos/index.html.haml
index 1f9896377..baef72745 100644
--- a/app/views/photos/index.html.haml
+++ b/app/views/photos/index.html.haml
@@ -8,21 +8,13 @@
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Photos', photos_path
-.pagination
-  = page_entries_info @photos
-  = will_paginate @photos
 
-.row
+= page_entries_info @photos
+= will_paginate @photos
+
+.index-cards
   - @photos.each do |p|
-    .col-md-2.six-across
-      = render 'photos/card', photo: p
-      -# .thumbnail{ style: 'height: 220px' }
-      -#   = link_to image_tag(p.thumbnail_url, alt: p.title, class: 'img'), p
-      -#   %p
-      -#     = link_to p.title, p
-      -#     by
-      -#     = link_to p.owner, p.owner
+    = render 'photos/card', photo: p
 
-.pagination
-  = page_entries_info @photos
-  = will_paginate @photos
+= page_entries_info @photos
+= will_paginate @photos
diff --git a/app/views/places/show.html.haml b/app/views/places/show.html.haml
index 23fa46e3e..98b9b7360 100644
--- a/app/views/places/show.html.haml
+++ b/app/views/places/show.html.haml
@@ -9,46 +9,44 @@
 %h1 #{ENV['GROWSTUFF_SITE_NAME']} community near #{@place}
 = render partial: 'search_form'
 
-#placesmap{ style: "height:300px" }
+%section.map#placesmap{ style: "height:300px" }
 
-%h3#members= "Nearby members"
+%section.members
+  %h2#members= "Nearby members"
 
-- if !@nearby_members.empty?
-  .row
-    - @nearby_members.first(30).each do |member|
-      .col-md-4.three-across
+  - if @nearby_members.any?
+    .index-cards.members
+      - @nearby_members.first(30).each do |member|
         = render partial: "members/thumbnail", locals: { member: member }
+  - else
+    %p No nearby members
   = link_to "View all members >>", members_path
 
-  %h3#seeds Seeds available for trade near #{@place}
+%section.seeds
+  %h2#seeds Seeds available for trade near #{@place}
   - crop_id = []
   - @nearby_members.first(10).each do |member|
     - member.seeds.first(5).each do |seed|
       - crop_id.push seed.crop.id
-  - if !crop_id.blank?
-    .row
+  - if crop_id.present?
+    .index-cards.crops
       - crop_id.uniq.first(20).each do |crop|
-        .col-md-2.six-across
-          = render partial: "crops/thumbnail", locals: { crop: Crop.find(crop) }
-    = link_to "View all seeds >>", seeds_path
+        = render partial: "crops/thumbnail", locals: { crop: Crop.find(crop) }
   - else
     %p No nearby seeds found
+  = link_to "View all seeds >>", seeds_path
 
-  #plantings
-  %h3 Recent plantings near #{@place}
-
+%section#plantings
+  %h2 Recent plantings near #{@place}
 
   - plantings = []
   - @nearby_members.first(10).each do |member|
     - member.plantings.first(5).each do |planting|
       - plantings << planting
-  - if !plantings.blank?
-    .row
+  - if plantings.any?
+    .index-cards.plantings
       - plantings.first(10).each.with_index do |planting, index|
-        .col-xs-12.col-lg-6
-          = render partial: "plantings/card", locals: { planting: planting, index: index }
-    = link_to "View all plantings >>", plantings_path
+        = render partial: "plantings/card", locals: { planting: planting, index: index }
   - else
     %p No nearby plantings found
-- else
-  %p No results found
+  = link_to "View all plantings >>", plantings_path
diff --git a/app/views/plantings/_actions.html.haml b/app/views/plantings/_actions.html.haml
index f69b900b9..e974526af 100644
--- a/app/views/plantings/_actions.html.haml
+++ b/app/views/plantings/_actions.html.haml
@@ -1,6 +1,6 @@
 - if can?(:edit, planting)
-  .dropdown.float-right.planting-actions
-    %a#planting-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'} Actions
+  .dropdown.planting-actions
+    %a#planting-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
       = planting_edit_button(planting, classes: 'dropdown-item')
       = add_photo_button(planting, classes: 'dropdown-item')
diff --git a/app/views/plantings/_card.html.haml b/app/views/plantings/_card.html.haml
index c6695f3e0..479815afa 100644
--- a/app/views/plantings/_card.html.haml
+++ b/app/views/plantings/_card.html.haml
@@ -1,6 +1,6 @@
-.card.planting
+.card.planting-card.planting
   = link_to planting do
-    = image_tag planting_image_path(planting, full_size: true), class: 'img-card', alt: planting
+    = image_tag planting_image_path(planting), class: 'img-card', alt: planting
   - if can? :edit, planting
     .planting-quick-actions
       .dropdown
@@ -21,4 +21,6 @@
   .card-body.text-center
     %h4.card-title= link_to planting.crop, planting
     .text-center= render 'plantings/badges', planting: planting
-    = render 'plantings/progress', planting: planting
\ No newline at end of file
+    = render 'plantings/progress', planting: planting
+  -# .card-footer
+  -#   .float-right=render 'members/tiny', member: planting.owner
\ No newline at end of file
diff --git a/app/views/plantings/_descendants.html.haml b/app/views/plantings/_descendants.html.haml
index 4cfc1e23e..64f93a2c8 100644
--- a/app/views/plantings/_descendants.html.haml
+++ b/app/views/plantings/_descendants.html.haml
@@ -1,8 +1,8 @@
 %h2 Seeds saved
-
 - if planting.child_seeds.size.positive?
-  - planting.child_seeds.each do |seed|
-    = render 'seeds/thumbnail', seed: seed
+  .index-cards
+    - planting.child_seeds.each do |seed|
+      = render 'seeds/card', seed: seed
 - else
   %p No seeds saved
 
diff --git a/app/views/plantings/_facts.haml b/app/views/plantings/_facts.haml
index 480595bde..a6afb8122 100644
--- a/app/views/plantings/_facts.haml
+++ b/app/views/plantings/_facts.haml
@@ -1,106 +1,88 @@
-.index-cards.planting-facts
+.index-cards.facts.plantingfacts
   - if planting.parent_seed
-    .card.planting-fact-card
+    .card.fact-card
       %h3 Parent seed
-      %strong
+      %strong.plantingfact--parentseed
         = link_to seed_path(planting.parent_seed) do
           = seed_icon
       %span=planting.parent_seed
 
-
-  - if planting.finished
-    .card.planting-fact-card
+  - if planting.finished?
+    .card.fact-card
       %h3 Planted
       %strong=planting_icon
       - if planting.quantity.present?
-        %span= planting.quantity
+        %span.plantingfact--quantity= planting.quantity
 
   - if planting.planted_at.present? && !planting.finished?
-    .card.planting-fact-card
+    .card.fact-card
       %h3 Planted
-      %strong #{planting.days_since_planted}
+      %strong.plantingfact--dayssinceplanted #{planting.days_since_planted}
       %span days ago
   - if planting.quantity.to_i.positive?
-    .card.planting-fact-card
+    .card.fact-card
       %h3 Quantity
-      %strong= planting.quantity
+      %strong.plantingfact--quantity= planting.quantity
       %span
         - if planting.planted_from.present?
           #{pluralize((planting.quantity.to_i), planting.planted_from)}
 
   - unless planting.finished?
-    .card.planting-fact-card.grid-sizer
+    .card.fact-card.grid-sizer
       %h3 Growing
       %strong= seedling_icon
       - if planting.planted_at.present?
-        %span= planting.planted_at.to_formatted_s(:rfc822)
-
-    - if planting.percentage_grown
-      .card.planting-fact-card
-        %h3 Progress
-        %strong #{sprintf '%.0f', planting.percentage_grown}%
-        .progress
-          .progress-bar.progress-bar-success{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => planting.percentage_grown, :role => "progressbar", :style => "width: #{planting.percentage_grown}%"}
-            %span.sr-only #{sprintf '%.0f', planting.percentage_grown}%
-
-
+        %span.plantingfact--planttedat= I18n.l planting.planted_at.to_date
 
 
   - if planting.planted_from.present?
-    .card.planting-fact-card
+    .card.fact-card
       %h3 Grown from
-      %span=planting.planted_from
+      %span.plantingfact--plantedfrom=planting.planted_from
 
-  .card.planting-fact-card
+  .card.fact-card
     %h3 Grown in
     %strong= sunniness_icon(planting.sunniness)
-    %span= planting.sunniness.blank? ? "not specified" : planting.sunniness
+    %span.plantingfact--sunniness= planting.sunniness.blank? ? "not specified" : planting.sunniness
 
-  -# .card.planting-fact-card
-  -#   %h3 Garden
-  -#   = link_to planting.garden do
-  -#     - if planting.garden.default_photo.present?
-  -#       = image_tag planting.garden.default_photo.thumbnail_url
-  -#     - else
-  -#       %strong= garden_icon
-  -#       %span= planting.garden.name
-
-  .card.planting-fact-card
-    %h3
-      = planting.finished? ? "Harvests" : "Harvesting"
+  .card.fact-card
+    %h3.plantingfact--harveststitle
+      = planting.finished? ? "Harvested" : "Harvesting"
     %strong
       = link_to planting_harvests_path(planting) do
         = harvest_icon
-    %span= planting.first_harvest_date&.to_formatted_s(:rfc822) || planting&.first_harvest_predicted_at&.to_formatted_s(:rfc822) || 'unknown'
+    %span.plantingfact--harvestprediction
+      = planting.first_harvest_date&.to_formatted_s(:rfc822) || planting&.first_harvest_predicted_at&.to_formatted_s(:rfc822) || 'unknown'
 
   - if planting.crop.perennial
-    .card.planting-fact-card
-      %h3 Perennial
+    .card.fact-card
+      %h3.plantingfact--perennial Perennial
       %strong=perennial_icon
   - else
     - if !planting.finished? && planting.finish_is_predicatable?
-      .card.planting-fact-card
+      .card.fact-card
         - days = days_from_now_to_finished(planting)
         - if days.positive?
-          %h3 Prediction
-          %strong #{days}
+          %h3.plantingfact--finishtitle Prediction
+          %strong.plantingfact--finisheddays #{days}
           %span days until finished
         - else
-          %h3 Finish
-          %strong #{days * -1}
+          %h3.plantingfact--finishtitle Finished
+          %strong.plantingfact--finisheddays #{days * -1}
           %span days ago
         %span= planting.finish_predicted_at&.to_formatted_s(:rfc822)
 
   - if planting.child_seeds.size.positive?
-    .card.planting-fact-card
+    .card.fact-card
       %h3 Seeds saved
       %strong
         = link_to planting_seeds_path(planting) do
           = seed_icon
-      %span #{pluralize(planting.child_seeds.size, 'packet')} of seed
+      %span.plantingfact--seedssaved #{pluralize(planting.child_seeds.size, 'packet')} of seed
 
   - if planting.finished?
-    .card.planting-fact-card
+    .card.fact-card
       %h3 Finished
       %strong=finished_icon
-      %span=planting.finished_at&.to_formatted_s(:rfc822)
+      %span.plantingfact--finish=planting.finished_at&.to_formatted_s(:rfc822)
+
diff --git a/app/views/plantings/_harvests.html.haml b/app/views/plantings/_harvests.html.haml
index 5ed44f59f..ec3933ef1 100644
--- a/app/views/plantings/_harvests.html.haml
+++ b/app/views/plantings/_harvests.html.haml
@@ -4,8 +4,8 @@
   - if !planting.finished? && can?(:edit, planting) && can?(:create, Harvest)
     %p Record your harvests here to improve crop predictions, and you'll be able to compare with your garden next season.
 - else
-  .row
+  .index-cards
     - planting.harvests.order(created_at: :desc).includes(:crop).each do |harvest|
-      .col-md-2.col-sm-6= render 'harvests/thumbnail', harvest: harvest
+      = render 'harvests/card', harvest: harvest
 
 = planting_harvest_button(planting)
diff --git a/app/views/plantings/_owner.haml b/app/views/plantings/_owner.haml
index b1a57a937..a97625dec 100644
--- a/app/views/plantings/_owner.haml
+++ b/app/views/plantings/_owner.haml
@@ -1,17 +1,18 @@
-.well
-  .row
-    .col-md-6
-      %h4
-        Planted by
-        = link_to @planting.owner, @planting.owner
-      = link_to "view all #{@planting.owner}'s plantings", member_gardens_path(@planting.owner)
+.card
+  .card-body
+    .row
+      .col-md-6
+        %h4
+          Planted by
+          = link_to @planting.owner, @planting.owner
+        = link_to "view all #{@planting.owner}'s plantings", member_gardens_path(@planting.owner)
 
-      %p
-        Planted in
-        = link_to @planting.garden, @planting.garden
-      - if @planting.owner.location
         %p
-          %small
-            View other plantings, members and more near
-            = link_to @planting.owner.location, place_path(@planting.owner.location, anchor: "plantings")
-    .col-md-6= render "members/avatar", member: @planting.owner
\ No newline at end of file
+          Planted in
+          = link_to @planting.garden, @planting.garden
+        - if @planting.owner.location
+          %p
+            %small
+              View other plantings, members and more near
+              = link_to @planting.owner.location, place_path(@planting.owner.location, anchor: "plantings")
+      .col-md-6= render "members/avatar", member: @planting.owner
\ No newline at end of file
diff --git a/app/views/plantings/_progress.html.haml b/app/views/plantings/_progress.html.haml
index 16fb5686f..a26fa646a 100644
--- a/app/views/plantings/_progress.html.haml
+++ b/app/views/plantings/_progress.html.haml
@@ -4,5 +4,5 @@
 
   .float-left #{sprintf '%.0f', planting.percentage_grown}%
 
-- unless planting.finish_predicted_at.blank?
-  .float-right= planting.finish_predicted_at.strftime(Date::DATE_FORMATS[:ymd])
+  - unless planting.finish_predicted_at.blank?
+    .float-right= planting.finish_predicted_at.strftime(Date::DATE_FORMATS[:ymd])
diff --git a/app/views/plantings/_thumbnail.html.haml b/app/views/plantings/_thumbnail.html.haml
index c8513fd7e..aec971fd3 100644
--- a/app/views/plantings/_thumbnail.html.haml
+++ b/app/views/plantings/_thumbnail.html.haml
@@ -1,10 +1,12 @@
 .card.thumbnail
   /= render 'plantings/quick_actions', planting: planting
   .planting-thumbnail-image
-    = link_to image_tag(planting_image_path(planting, full_size: true),
+    = link_to image_tag(planting_image_path(planting),
                         alt: planting.crop, class: 'img-card'),
                         planting
   .card-body
-    %h5.card-title= link_to planting.crop, planting
+    %h5.card-title
+      = crop_icon(planting.crop)
+      = link_to planting.crop, planting
     %h6.card-subtitle.text-muted=planting.finished_at
     = render 'plantings/badges', planting: planting
diff --git a/app/views/plantings/index.html.haml b/app/views/plantings/index.html.haml
index f0c60a53e..407a97b41 100644
--- a/app/views/plantings/index.html.haml
+++ b/app/views/plantings/index.html.haml
@@ -1,11 +1,5 @@
 - content_for :title, title('plantings', @owner, @crop, @planting)
 
-%h1
-  = planting_icon
-  = title('plantings', @owner, @crop, @planting)
-
-= render 'layouts/nav', model: Planting
-
 - content_for :breadcrumbs do
   - if @owner
     %li.breadcrumb-item= link_to 'Plantings', plantings_path
@@ -13,6 +7,13 @@
   - else
     %li.breadcrumb-item.active= link_to 'Plantings', plantings_path
 
+%h1
+  = planting_icon
+  = title('plantings', @owner, @crop, @planting)
+
+= render 'layouts/nav', model: Planting
+
+
 %section.border-top
   .btn-group
     = link_to plantings_active_tickbox_path(@owner, @show_all), class: 'btn' do
@@ -26,15 +27,19 @@
   .col-12= page_entries_info @plantings
   .col-12= render 'layouts/pagination', collection: @plantings
 
-.index-cards= render @plantings, full: true
+.index-cards
+  - @plantings.each do |planting|
+    = render planting, full: true
 
 .row
   .col-12= page_entries_info @plantings
   .col-12= render 'layouts/pagination', collection: @plantings
 
-%p= t('.the_data_on_this_page_is_available_in_the_following_formats')
-%ul.list-group.list-group-horizontal
-  - ['csv', 'json', 'rss'].each do |format|
-    %li.list-group-item
-      = icon 'fas', format
-      = link_to format.upcase, (@owner ? member_plantings_path(@owner, format: format) : plantings_path(format: format))
+%section.open-data
+  %h5= t('label.data')
+  %ul.nav#open-data
+    - ['csv', 'json', 'rss'].each do |format|
+      %li.list-group-item
+        = link_to (@owner ? member_plantings_path(@owner, format: format) : plantings_path(format: format)) do
+          = icon 'fas', format.to_s
+          = format.upcase
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index 160c7d031..f173b2ba4 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -9,16 +9,22 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
+- content_for :breadcrumbs do
+  %li.breadcrumb-item= link_to 'Plantings', plantings_path
+  %li.breadcrumb-item= link_to @planting.owner, member_plantings_path(@planting.owner)
+  %li.breadcrumb-item.active= link_to @planting, @planting
 
 .planting
   .row
     .col-md-8.col-xs-12
-      %h1
-        = planting_icon
-        %strong= @planting
-        = render 'plantings/actions', planting: @planting
+      %h1.plantingtitle
+        %span.plantingtitle--icon= planting_icon
+        = @planting.to_s.titleize
+
+      = render 'plantings/actions', planting: @planting
 
       %section= render 'facts', planting: @planting
+
       - if @planting.description.present?
         %hr/
         .card
@@ -27,15 +33,19 @@
           .card-body
             :growstuff_markdown
               #{strip_tags(@planting.description)}
-      %hr/
       %section= render 'plantings/photos', photos: @photos, planting: @planting
-    .col-md-4.col-xs-12.text-right
-      .card
-        .card-body= render 'plantings/owner', planting: @planting
+    .col-md-4.col-xs-12
+      - if @planting.percentage_grown
+        .card
+          .progress
+            .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
+          %strong.plantingfact--percentagegrown
+            #{sprintf '%.0f', @planting.percentage_grown}%
+
+      = render 'plantings/owner', planting: @planting
       = render @planting.crop
   .row
-    .col-md-12
-      %hr/
+    .col-md-6
       %section= render 'plantings/harvests', planting: @planting
-      %hr/
+    .col-md-6
       %section= render 'plantings/descendants', planting: @planting
diff --git a/app/views/posts/_preview.haml b/app/views/posts/_preview.haml
index 1d7ccbf37..275e5f1fa 100644
--- a/app/views/posts/_preview.haml
+++ b/app/views/posts/_preview.haml
@@ -1,14 +1,6 @@
-%section
-  .row
-    .col-md-12
-      .card.card-cascade
-        .card-header
-          %h2= link_to post.subject, post
-          %p
-            Written by
-            %strong= link_to post.author, post.author
-        .card-body
-          .float-right= render 'members/tiny', member: post.author
-
-          %p
-            = truncate(strip_tags(post.body), length: 200)
+.card.card-cascade
+  .card-header
+    %h3= link_to post.subject, post
+    = render 'members/tiny', member: post.author
+  .card-body
+    %p= truncate(strip_tags(post.body), length: 200)
diff --git a/app/views/posts/index.html.haml b/app/views/posts/index.html.haml
index fd987aeac..9e1ffc35b 100644
--- a/app/views/posts/index.html.haml
+++ b/app/views/posts/index.html.haml
@@ -1,47 +1,47 @@
 - content_for :title, @author ? t('.title.author_posts', author: @author) : t('.title.default')
 
 - content_for :breadcrumbs do
+  %li.breadcrumb-item= link_to 'Posts', posts_path
   - if @author.present?
     %li.breadcrumb-item= link_to @author, @author
     %li.breadcrumb-item.active= link_to 'posts', posts_path(author: @author.slug)
 
 %h1= @author ? t('.title.author_posts', author: @author) : t('.title.default')
-.pagination= render 'layouts/pagination', collection: @posts
-.row
-  .card-deck
-    - @posts.each do |post|
-      .col-12.col-md-6
-        .card.post
-          .card-body
-            .row
-              .col-2.text-right
-                = render 'members/avatar', member: post.author
-              .col-10.border-left
-                %h5.card-title
-                  = link_to strip_tags(post.subject), post
-                  - if post.comments.size.positive?
-                    %span.badge.badge-pill.badge-info.float-right
-                      = icon 'fas', 'comment'
-                      = post.comments.size
-                %p.text-muted
-                  Posted by
-                  - if post.author
-                    = link_to post.author.login_name, member_path(post.author)
-                  - else
-                    Member Deleted
 
-                  - if post.forum
-                    in #{link_to post.forum, post.forum}
-                  on #{post.created_at}"
-                  - if post.updated_at > post.created_at
-                    and edited at #{post.updated_at}
-                .card-text
-                  .post-body= display_post_truncated(post)
-                - post.crops.each do |crop|
-                  %span.badge.badge-pill.badge-primary= link_to crop, crop
+= render 'layouts/nav', model: Post
+
+= will_paginate @posts
+
+- @posts.each do |post|
+  .card.post
+    .card-body
+      %h5.card-title
+        = link_to strip_tags(post.subject), post
+        - if post.comments.size.positive?
+          %span.badge.badge-pill.badge-info.float-right
+            = icon 'fas', 'comment'
+            &nbsp;
+            = post.comments.size
+      %p.text-muted
+        Posted by
+        - if post.author
+          = link_to post.author.login_name, member_path(post.author)
+        - else
+          Member Deleted
+
+        - if post.forum
+          in #{link_to post.forum, post.forum}
+        on #{post.created_at}"
+        - if post.updated_at > post.created_at
+          and edited at #{post.updated_at}
+      = render 'members/tiny', member: post.author
+      .card-body
+        .post-body= display_post_truncated(post)
+      - post.crops.each do |crop|
+        = render 'crops/tiny', crop: crop
 
 
-.pagination= render 'layouts/pagination', collection: @posts
+= will_paginate @posts
 
 %p
   - if @author
diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml
index f88612496..f7d09a620 100644
--- a/app/views/posts/show.html.haml
+++ b/app/views/posts/show.html.haml
@@ -51,16 +51,17 @@
               = icon 'fas', 'comment'
               Comment
 
-    %secion.comments= render "comments", post: @post
+    %section.comments
+      = render "comments", post: @post
 
   .col-md-4.col-12
     = render @post.author
-    .row
-      - unless @post.crops.empty?
-        .col-12
-          %h3.h3 Crops mentioned in this post
-        - @post.crops.each do |c|
-          .col-6= render 'crops/thumbnail', crop: c
+    - unless @post.crops.empty?
+      %section.crops
+        %h2 Crops mentioned in this post
+        .index-cards
+          - @post.crops.each do |c|
+            = render 'crops/thumbnail', crop: c
 
 
 
diff --git a/app/views/seeds/_actions.html.haml b/app/views/seeds/_actions.html.haml
index 716724399..5cc91951a 100644
--- a/app/views/seeds/_actions.html.haml
+++ b/app/views/seeds/_actions.html.haml
@@ -1,12 +1,12 @@
-- if can?(:create, Planting) && can?(:update, seed) && seed.active?
-  = link_to new_planting_path(seed_id: seed), class: 'btn btn-info' do
-    %span.glyphicon.glyphicon-grain{ title: "Plant seeds" }
-    Plant seeds
 - if can?(:edit, seed)
-  .dropdown.float-right.seed-actions
-    %a#seed-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'}
+  .dropdown.seed-actions
+    %a#seed-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'}
       Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "seed-actions-button"}
+      - if can?(:create, Planting) && can?(:update, seed) && seed.active?
+        = link_to new_planting_path(seed_id: seed), class: 'dropdown-item success-color' do
+          = seed_icon
+          Plant seeds
       = seed_edit_button(seed, classes: 'dropdown-item')
       = add_photo_button(seed, classes: 'dropdown-item')
       - if seed.active?
diff --git a/app/views/seeds/_card.html.haml b/app/views/seeds/_card.html.haml
index cd7db9099..a6a975ef2 100644
--- a/app/views/seeds/_card.html.haml
+++ b/app/views/seeds/_card.html.haml
@@ -1,13 +1,16 @@
 .card.seed-card
   = link_to seed do
-    = image_tag(seed_image_path(seed, full_size: true), alt: seed, class: 'img-card')
+    = image_tag(seed_image_path(seed), alt: seed, class: 'img-card')
   .card-body
-    .card-title= link_to seed.crop, seed
+    .card-title
+      = crop_icon(seed.crop)
+      = link_to seed.crop, seed
   .card-footer
     = render 'members/tiny', member: seed.owner
     - if seed.tradable?
-      %span.badge.badge-pill.badge-info
+      .text-muted
         = icon 'fas', 'map'
         Will trade #{seed.tradable_to}
-    %span.badge.badge-pill.badge-secondary
-      = truncate(seed.owner.location, length: 30, separator: ' ', omission: '... ')
\ No newline at end of file
+    .badge.badge-pill.badge-location
+      = icon 'fas', 'map-marker'
+      = truncate(seed.owner.location, length: 20, separator: ' ', omission: '... ')
\ No newline at end of file
diff --git a/app/views/seeds/_descendants.html.haml b/app/views/seeds/_descendants.html.haml
index 1736d0bca..3a2a445aa 100644
--- a/app/views/seeds/_descendants.html.haml
+++ b/app/views/seeds/_descendants.html.haml
@@ -1,13 +1,5 @@
-%h2 Plants grown from these seeds
-- if @seed.child_plantings
-  .row
+- if @seed.child_plantings.any?
+  %h2 Plants grown from these seeds
+  .index-cards
     - seed.child_plantings.each do |planting|
-      .col-md-3
-        = render 'plantings/thumbnail', planting: planting
-- else
-  %p No plants grown yet.
-
-- if can?(:create, Planting) && can?(:edit, seed)
-  = link_to new_seed_planting_path(seed), class: 'btn btn-primary' do
-    %span.glyphicon.glyphicon-grain{ title: "Plant seeds" }
-    Plant seeds
+      = render 'plantings/thumbnail', planting: planting
diff --git a/app/views/seeds/_facts.html.haml b/app/views/seeds/_facts.html.haml
new file mode 100644
index 000000000..51e19212c
--- /dev/null
+++ b/app/views/seeds/_facts.html.haml
@@ -0,0 +1,29 @@
+.index-cards.facts.seedfacts
+  .card
+    %h3 Quantity
+    %strong.seedfacts--quantity= seed.quantity.blank? ? "not specified" : seed.quantity
+    %span seeds
+
+  - if seed.plant_before.present?
+    .card.seedfacts--card
+      %h3 Plant before
+      %strong.seedfacts--plantbefore= I18n.l(seed.plant_before)
+
+  -if seed.finished_at.present?
+    .card
+      %h3 Finished at
+      %strong.seedfacts--finishedat= I18n.l(seed.finished_at)
+  .card
+    %h3 Days until maturity
+    %strong.seedfacts--maturity= render partial: 'days_until_maturity', locals: { seed: seed }
+
+  .card
+    %h3 Will trade
+    %strong.seedfacts--tradableto= seed.tradable_to
+    %span
+      - if seed.owner.location.blank?
+        (from unspecified location)
+        - if current_member == seed.owner
+          = link_to "Set Location", edit_registration_path(current_member), class: 'btn btn-default btn-xs'
+      - else
+        (from #{link_to seed.owner.location, place_path(seed.owner.location, anchor: "seeds")})
diff --git a/app/views/seeds/_owner.html.haml b/app/views/seeds/_owner.html.haml
new file mode 100644
index 000000000..0dd3f9dda
--- /dev/null
+++ b/app/views/seeds/_owner.html.haml
@@ -0,0 +1,19 @@
+.card
+  .card-body
+    .row
+      .col-md-6
+        %h4
+          Planted by
+          = link_to @seed.owner, @seed.owner
+        = link_to "view all #{@seed.owner}'s seeds", member_seeds_path(@seed.owner)
+
+        - if @seed.parent_planting.present?
+          %p
+            Collected from
+            = link_to @seed.parent_planting, @seed.parent_planting
+        - if @seed.owner.location
+          %p
+            %small
+              View other seeds, members and more near
+              = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
+      .col-md-6= render "members/avatar", member: @seed.owner
\ No newline at end of file
diff --git a/app/views/seeds/index.html.haml b/app/views/seeds/index.html.haml
index 2b366b8c1..103fe7292 100644
--- a/app/views/seeds/index.html.haml
+++ b/app/views/seeds/index.html.haml
@@ -30,21 +30,12 @@
     = page_entries_info @seeds
     = will_paginate @seeds
 
-  %ul.nav.justify-content-center
-    %li.nav-item
-      The data on this page is available in the following formats:
-    - if @owner
-      %li.nav-item
-        = link_to "CSV", member_seeds_path(@owner, format: 'csv'), class: 'nav-link'
-      %li.nav-item
-        = link_to "JSON", member_seeds_path(@owner, format: 'json'), class: 'nav-link'
-      %li.nav-item
-        = link_to "RSS", member_seeds_path(@owner, format: 'rss'), class: 'nav-link'
-    - else
-      %li.nav-item
-        = link_to "CSV", seeds_path(format: 'csv'), class: 'nav-link'
-      %li.nav-item
-        = link_to "JSON", seeds_path(format: 'json'), class: 'nav-link'
-      %li.nav-item
-        = link_to "RSS", seeds_path(format: 'rss'), class: 'nav-link'
+%section.open-data
+  %h5= t('label.data')
+  %ul.nav#open-data
+    - ['csv', 'json', 'rss'].each do |format|
+      %li.list-group-item
+        = link_to (@owner ? member_seeds_path(@owner, format: format) : seeds_path(format: format)) do
+          = icon 'fas', format.to_s
+          = format.upcase
 
diff --git a/app/views/seeds/show.html.haml b/app/views/seeds/show.html.haml
index 07aec7b53..7ada4e8d9 100644
--- a/app/views/seeds/show.html.haml
+++ b/app/views/seeds/show.html.haml
@@ -12,58 +12,39 @@
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Seeds', seeds_path
+  %li.breadcrumb-item= link_to @seed.owner, member_seeds_path(@seed.owner)
   %li.breadcrumb-item.active= link_to @seed, @seed
 
-.row
-  .col-md-6
+.row.seeds
+  .col-md-8
     %h1
-      #{@seed.owner}'s #{@seed.crop} seeds
-      = render 'seeds/actions', seed: @seed
-    %dl.dl-horizontal
-      %dt Owner
-      %dd
-        = link_to @seed.owner, @seed.owner
-        &mdash;
-        = link_to "view all #{@seed.owner}'s seeds",
-          member_seeds_path(@seed.owner)
-      %dt Quantity:
-      %dd= @seed.quantity.blank? ? "not specified" : @seed.quantity
-      %dt Plant before:
-      %dd= @seed.plant_before.to_s
-      -if @seed.finished_at
-        %dt Finished at:
-        %dd= @seed.finished_at.to_s
-      %dt Days until maturity:
-      %dd= render partial: 'days_until_maturity', locals: { seed: @seed }
-      %dt Organic?
-      %dd= @seed.organic
-      %dt GMO?
-      %dd= @seed.gmo
-      %dt Heirloom?
-      %dd= @seed.heirloom
-      %dt Will trade:
-      %dd
-        = @seed.tradable_to
-        - if @seed.owner.location.blank?
-          (from unspecified location)
-          - if current_member == @seed.owner
-            = link_to "Set Location", edit_registration_path(current_member), class: 'btn btn-default btn-xs'
-        - else
-          (from
-          = succeed ")" do
-            = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
+      %span.seedtitle--icon= crop_icon(@seed.crop)
+      %strong
+        %span.seedtitle--owner #{@seed.owner}'s
+        %span.seedtitle--crop #{@seed.crop}
+        seeds
+      - if @seed.organic != 'unknown'
+        %small.seedtitle--organic= @seed.organic
+      - if @seed.gmo != 'unknown'
+        %small.seedtitle--gmo= @seed.gmo
+      - if @seed.heirloom != 'unknown'
+        %small.seedtitle--heirloom= @seed.heirloom
+      = I18n.l @seed.created_at.to_date
 
-      %dt When?
+    = render 'seeds/actions', seed: @seed
+
+    %section= render 'facts', seed: @seed
+    - if @seed.parent_planting
+      %dt Saved from planting:
       %dd
-        = @seed.created_at
-      - if @seed.parent_planting
-        %dt Saved from planting:
-        %dd
-          = link_to @seed.parent_planting, planting_path(@seed.parent_planting)
-      %dt Description:
-      %dd
-        :growstuff_markdown
-          #{ @seed.description != "" ? strip_tags(@seed.description) : "No description given." }
+        = link_to @seed.parent_planting, planting_path(@seed.parent_planting)
+    - unless @seed.description.blank?
+      .card.seed--description
+        .card-header
+          %h2 Notes
+        .card-body
+          :growstuff_markdown
+            #{ @seed.description != "" ? strip_tags(@seed.description) : "No description given." }
 
     - if current_member
       - if @seed.tradable? && current_member != @seed.owner
@@ -74,18 +55,21 @@
     - else
       = render 'shared/signin_signup', to: 'request seeds'
 
-    = render 'seeds/descendants', seed: @seed
-    = render 'photos/item_photos', item: @seed, type: 'seed', photos: @photos
-
-  .col-md-6
-    = render @seed.crop
+    %section= render 'seeds/descendants', seed: @seed
+    %section.seed-photos
+      - @photos.each do |photo|
+        = render 'photos/hero', photo: photo
+    %p
+      %small
+        Or
+        = link_to "purchase seeds via Ebay",
+        crop_ebay_seeds_url(@seed.crop), target: "_blank", rel: "noopener noreferrer", class: 'btn'
     - if @seed.owner.location
       %p
         %small
           View other seeds, members to trade with and more near
           = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
-    %p
-      %small
-        Or
-        = link_to "purchase seeds via Ebay",
-        crop_ebay_seeds_url(@seed.crop), target: "_blank", rel: "noopener noreferrer"
+  .col-md-4
+    = render 'seeds/owner'
+    = render @seed.crop
+
diff --git a/app/views/timeline/_photos.html.haml b/app/views/timeline/_photos.html.haml
index 12cddb1a2..732842c39 100644
--- a/app/views/timeline/_photos.html.haml
+++ b/app/views/timeline/_photos.html.haml
@@ -1,8 +1,11 @@
 .media
-  = link_to(image_tag(photo.fullsize_url, width: 150, class: 'rounded'), photo)
+  = link_to(image_tag(photo.thumbnail_url, width: 150, class: 'rounded'), photo)
   .media-body
     %p
       %ul.associations
+        - photo.crops.each do |crop|
+          %li= render 'crops/tiny', crop: crop
+
         - photo.plantings.each do |planting|
           %li
             = planting_icon
diff --git a/app/views/timeline/index.html.haml b/app/views/timeline/index.html.haml
index 1f374bc20..f94cafd1b 100644
--- a/app/views/timeline/index.html.haml
+++ b/app/views/timeline/index.html.haml
@@ -23,10 +23,7 @@
     .pagination= will_paginate @seeds
   .col-md-3
     .card
-      .card-header
+      .card-body
         %h3 Following
-      - @members.each do |member|
-        = link_to member do
-          %p
-            = render 'members/tiny', member: member
-            = member
+        - @members.each do |member|
+          = render 'members/tiny', member: member
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 11dd0a781..e14b1a037 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -132,8 +132,8 @@ en:
     blurb:
       already_html: Or %{sign_in} if you already have an account
       intro: >
-        %{site_name} is a community of food gardeners. We're building an open source platform to help you learn about growing food,
-        track what you plant and harvest, and swap seeds and produce with other gardeners near you.
+        %{site_name} is a community of food gardeners. %{site_name}'s open source and open data platform
+        can predict when your plantings will be ready to harvest. The more you tell it, the better the predictions.
       perks: Join now for your free garden journal, harvest predictions, forums, and more.
       sign_in_linktext: sign in
       sign_up: Sign up
@@ -208,6 +208,7 @@ en:
     days_until_harvest: "%{number} days"
     days_until_finished: "%{number} days"
     harvesting_now: harvesting now
+    data: 'The data on this page is available in the following formats:'
   layouts:
     header:
       account: Account
@@ -289,7 +290,6 @@ en:
         default: Everyone's plantings
         owner_plantings: "%{owner} plantings"
       view_owners_profile: View %{owner}'s profile >>
-      the_data_on_this_page_is_available_in_the_following_formats: 'The data on this page is available in the following formats:'
     string: "%{crop} planting in %{garden} by %{owner}"
     progress:
       progress_0_not_planted_yet: 'Progress: 0% - not planted yet'
diff --git a/config/routes.rb b/config/routes.rb
index e1424d010..334bf106c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -69,6 +69,7 @@ Rails.application.routes.draw do
     get 'sunniness' => 'charts/crops#sunniness', constraints: { format: 'json' }
     get 'planted_from' => 'charts/crops#planted_from', constraints: { format: 'json' }
     get 'harvested_for' => 'charts/crops#harvested_for', constraints: { format: 'json' }
+    post :openfarm
 
     collection do
       get 'requested'
diff --git a/db/migrate/20190902004225_add_openfarm_data_to_crops.rb b/db/migrate/20190902004225_add_openfarm_data_to_crops.rb
new file mode 100644
index 000000000..f8cc4d43d
--- /dev/null
+++ b/db/migrate/20190902004225_add_openfarm_data_to_crops.rb
@@ -0,0 +1,5 @@
+class AddOpenfarmDataToCrops < ActiveRecord::Migration[5.2]
+  def change
+    add_column :crops, :openfarm_data, :jsonb
+  end
+end
diff --git a/db/migrate/20190918033319_unique_urls.rb b/db/migrate/20190918033319_unique_urls.rb
new file mode 100644
index 000000000..99b9caf42
--- /dev/null
+++ b/db/migrate/20190918033319_unique_urls.rb
@@ -0,0 +1,6 @@
+class UniqueUrls < ActiveRecord::Migration[5.2]
+  def change
+    add_index :photos, :fullsize_url, unique: true
+    add_index :photos, :thumbnail_url, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4a450b704..7f611b3e6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -185,6 +185,7 @@ ActiveRecord::Schema.define(version: 2019_09_21_211652) do
     t.integer "median_lifespan"
     t.integer "median_days_to_first_harvest"
     t.integer "median_days_to_last_harvest"
+    t.jsonb "openfarm_data"
     t.index ["name"], name: "index_crops_on_name"
     t.index ["requester_id"], name: "index_crops_on_requester_id"
     t.index ["slug"], name: "index_crops_on_slug", unique: true
@@ -427,6 +428,8 @@ ActiveRecord::Schema.define(version: 2019_09_21_211652) do
     t.datetime "date_taken"
     t.integer "likes_count", default: 0
     t.string "source"
+    t.index ["fullsize_url"], name: "index_photos_on_fullsize_url", unique: true
+    t.index ["thumbnail_url"], name: "index_photos_on_thumbnail_url", unique: true
   end
 
   create_table "photos_plantings", id: false, force: :cascade do |t|
diff --git a/db/seeds.rb b/db/seeds.rb
index 378b98875..e3bc51088 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -115,6 +115,8 @@ def load_admin_users
 end
 
 def create_cropbot
+  return if Member.find_by(login_name: 'cropbot')
+
   @cropbot_user = Member.new(
     login_name:    "cropbot",
     email:         Rails.application.config.bot_email,
diff --git a/lib/tasks/openfarm.rake b/lib/tasks/openfarm.rake
new file mode 100644
index 000000000..b6b6ce909
--- /dev/null
+++ b/lib/tasks/openfarm.rake
@@ -0,0 +1,9 @@
+namespace :openfarm do
+  desc "Retrieve crop info from open farm"
+  # usage: rake growstuff:admin_user name=skud
+
+  task import: :environment do
+    Rails.logger = Logger.new(STDOUT)
+    OpenfarmService.new.import!
+  end
+end
diff --git a/spec/factories/planting.rb b/spec/factories/planting.rb
index 24c092f82..8fb709d1c 100644
--- a/spec/factories/planting.rb
+++ b/spec/factories/planting.rb
@@ -38,5 +38,26 @@ FactoryBot.define do
       planted_at { Time.zone.local(2014, 7, 30) }
       finished_at { Time.zone.local(2014, 8, 30) }
     end
+
+    factory :annual_planting do
+      crop { FactoryBot.create :annual_crop }
+    end
+
+    factory :perennial_planting do
+      crop { FactoryBot.create :perennial_crop }
+    end
+
+    factory :predicatable_planting do
+      crop do
+        crop = FactoryBot.create :annual_crop
+        FactoryBot.create :planting, crop: crop, planted_at: 10.days.ago
+        FactoryBot.create :planting, crop: crop, planted_at: 100.days.ago, finished_at: 50.days.ago
+        FactoryBot.create :planting, crop: crop, planted_at: 100.days.ago, finished_at: 51.days.ago
+        FactoryBot.create :planting, crop: crop, planted_at: 2.years.ago, finished_at: 50.days.ago
+        FactoryBot.create :planting, crop: crop, planted_at: 150.days.ago, finished_at: 100.days.ago
+        crop.update_lifespan_medians
+        crop
+      end
+    end
   end
 end
diff --git a/spec/features/crops/request_new_crop_spec.rb b/spec/features/crops/request_new_crop_spec.rb
index 4257e3a69..da38b1ec9 100644
--- a/spec/features/crops/request_new_crop_spec.rb
+++ b/spec/features/crops/request_new_crop_spec.rb
@@ -20,19 +20,17 @@ describe "Requesting a new crop" do
 
     it "Approve a request" do
       visit edit_crop_path(crop)
-      select "approved", from: "Approval status"
-      click_button "Save"
+      click_button "Approve and save"
       expect(page).to have_content "En wikipedia url is not a valid English Wikipedia URL"
       fill_in "en_wikipedia_url", with: "http://en.wikipedia.org/wiki/Aung_San_Suu_Kyi"
-      click_button "Save"
+      click_button "Approve and save"
       expect(page).to have_content "crop was successfully updated."
     end
 
     it "Rejecting a crop" do
       visit edit_crop_path(crop)
-      select "rejected", from: "Approval status"
       select "not edible", from: "Reason for rejection"
-      click_button "Save"
+      click_button "Reject"
       expect(page).to have_content "crop was successfully updated."
     end
   end
diff --git a/spec/features/gardens/actions_spec.rb b/spec/features/gardens/actions_spec.rb
index 0c9336a74..0dbfe1882 100644
--- a/spec/features/gardens/actions_spec.rb
+++ b/spec/features/gardens/actions_spec.rb
@@ -12,7 +12,7 @@ describe "Gardens" do
     describe '#index' do
       shared_examples "has buttons bar at top" do
         it "has buttons bar at top" do
-          within '.layout-actions' do
+          within '.nav' do
             expect(subject).to have_link 'Add a garden'
             expect(subject).to have_link 'My gardens'
             expect(subject).to have_link "Everyone's gardens"
diff --git a/spec/features/gardens/gardens_spec.rb b/spec/features/gardens/gardens_spec.rb
index 132997584..6b845bc50 100644
--- a/spec/features/gardens/gardens_spec.rb
+++ b/spec/features/gardens/gardens_spec.rb
@@ -12,13 +12,9 @@ describe "Planting a crop", js: true do
     it "View gardens" do
       visit gardens_path
       expect(page).to have_content "Everyone's gardens"
-      within '.layout-actions' do
-        click_link "My gardens"
-      end
+      click_link "My gardens"
       expect(page).to have_content "#{garden.owner.login_name}'s gardens"
-      within '.layout-actions' do
-        click_link "Everyone's gardens"
-      end
+      click_link "Everyone's gardens"
       expect(page).to have_content "Everyone's gardens"
     end
 
diff --git a/spec/features/plantings/show_spec.rb b/spec/features/plantings/show_spec.rb
new file mode 100644
index 000000000..e9d39fca3
--- /dev/null
+++ b/spec/features/plantings/show_spec.rb
@@ -0,0 +1,42 @@
+require "rails_helper"
+require 'custom_matchers'
+
+describe "Display a planting", :js, :elasticsearch do
+  before { visit planting_path(planting) }
+
+  context 'Perennial planted long ago' do
+    let(:planting) { FactoryBot.create :perennial_planting }
+    it { expect(find('.plantingfact--perennial')).to have_text 'Perennial' }
+    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
+  end
+
+  context 'Perennial finished' do
+    let(:planting) { FactoryBot.create :perennial_planting, planted_at: 6.years.ago, finished: true, finished_at: 1.year.ago }
+    it { expect(find('.plantingfact--perennial')).to have_text 'Perennial' }
+    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvested' }
+  end
+
+  context 'Annual no predictions' do
+    let(:planting) { FactoryBot.create :annual_planting }
+    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
+  end
+
+  context 'Annual with predicted finish' do
+    let(:planting) { FactoryBot.create :predicatable_planting, planted_at: 1.day.ago }
+    it { expect(find('.plantingfact--dayssinceplanted')).to have_text '1' }
+    it { expect(find('.plantingfact--percentagegrown')).to have_text '2%' }
+    it { expect(find('.plantingfact--planttedat')).to have_text I18n.l(1.day.ago.to_date) }
+    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
+  end
+
+  context 'Annual finished' do
+    let(:planting) { FactoryBot.create :annual_planting, planted_at: 100.days.ago, finished: true, finished_at: 1.day.ago }
+    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvested' }
+  end
+
+  context 'with quantity' do
+    let(:planting) { FactoryBot.create :planting, quantity: 100 }
+    it { expect(find('.plantingfact--quantity')).to have_text '100' }
+    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
+  end
+end
diff --git a/spec/features/seeds/adding_seeds_spec.rb b/spec/features/seeds/adding_seeds_spec.rb
index dd667bdb7..e2264eaa2 100644
--- a/spec/features/seeds/adding_seeds_spec.rb
+++ b/spec/features/seeds/adding_seeds_spec.rb
@@ -46,12 +46,12 @@ describe "Seeds", :js, :elasticsearch do
       end
 
       it { expect(page).to have_content "Successfully added maize seed to your stash" }
-      it { expect(page).to have_content "Quantity: 42" }
-      it { expect(page).to have_content "Days until maturity: 999–1999" }
-      it { expect(page).to have_content "certified organic" }
-      it { expect(page).to have_content "non-certified GMO-free" }
-      it { expect(page).to have_content "Heirloom? heirloom" }
-      it { expect(page).to have_content "It's killer." }
+      it { expect(find('.seedfacts--quantity')).to have_content "42" }
+      it { expect(find('.seedfacts--maturity')).to have_content "999–1999" }
+      it { expect(find('.seedtitle--organic')).to have_content "certified organic" }
+      it { expect(find('.seedtitle--gmo')).to have_content "non-certified GMO-free" }
+      it { expect(find('.seedtitle--heirloom')).to have_content "heirloom" }
+      it { expect(find('.seed--description')).to have_content "It's killer." }
     end
 
     describe "Adding a seed from crop page" do
diff --git a/spec/features/seeds/misc_seeds_spec.rb b/spec/features/seeds/misc_seeds_spec.rb
index b2205ee8a..53587ede5 100644
--- a/spec/features/seeds/misc_seeds_spec.rb
+++ b/spec/features/seeds/misc_seeds_spec.rb
@@ -68,25 +68,25 @@ describe "seeds", js: true do
       describe "view seeds with max and min days until maturity" do
         let(:seed) { FactoryBot.create :seed, days_until_maturity_min: 5, days_until_maturity_max: 7 }
 
-        it { expect(page).to have_content "Days until maturity: 5–7" }
+        it { expect(find('.seedfacts--maturity')).to have_content("5–7") }
       end
 
       describe "view seeds with only max days until maturity" do
         let(:seed) { FactoryBot.create :seed, days_until_maturity_max: 7 }
 
-        it { expect(page).to have_content "Days until maturity: 7" }
+        it { expect(find('.seedfacts--maturity')).to have_content("7") }
       end
 
       describe "view seeds with only min days until maturity" do
         let(:seed) { FactoryBot.create :seed, days_until_maturity_min: 5 }
 
-        it { expect(page).to have_content "Days until maturity: 5" }
+        it { expect(find('.seedfacts--maturity')).to have_content("5") }
       end
 
       describe "view seeds with neither max nor min days until maturity" do
         let(:seed) { FactoryBot.create :seed }
 
-        it { expect(page).to have_content "Days until maturity: unknown" }
+        it { expect(find('.seedfacts--maturity')).to have_content "unknown" }
       end
     end
   end
diff --git a/spec/helpers/photos_helper_spec.rb b/spec/helpers/photos_helper_spec.rb
index efc6ef07e..b24a254c7 100644
--- a/spec/helpers/photos_helper_spec.rb
+++ b/spec/helpers/photos_helper_spec.rb
@@ -2,16 +2,16 @@ require 'rails_helper'
 
 describe PhotosHelper do
   let(:crop) { FactoryBot.create :crop }
+  let(:crop_photo_of) { FactoryBot.create(:photo, source: 'openfarm') }
+  let(:crop_photo_flickr) { FactoryBot.create(:photo, source: 'flickr') }
 
   let(:garden) { FactoryBot.create :garden }
-
-  let(:garden_photo)   { FactoryBot.create(:photo, thumbnail_url: 'garden.jpg', owner: garden.owner)   }
-  let(:planting)       { FactoryBot.create :planting, crop: crop, owner: garden.owner                  }
-  let(:planting_photo) { FactoryBot.create(:photo, thumbnail_url: 'planting.jpg', owner: garden.owner) }
-  let(:harvest)        { FactoryBot.create :harvest, crop: crop, owner: garden.owner                   }
-  let(:harvest_photo)  { FactoryBot.create(:photo, thumbnail_url: 'harvest.jpg', owner: garden.owner)  }
-  let(:seed)           { FactoryBot.create :seed, crop: crop, owner: garden.owner                      }
-  let(:seed_photo)     { FactoryBot.create(:photo, thumbnail_url: 'seed.jpg', owner: garden.owner)     }
+  let(:planting)       { FactoryBot.create :planting, crop: crop, owner: garden.owner }
+  let(:planting_photo) { FactoryBot.create(:photo, owner: garden.owner) }
+  let(:harvest)        { FactoryBot.create :harvest, crop: crop, owner: garden.owner }
+  let(:harvest_photo)  { FactoryBot.create(:photo, owner: garden.owner) }
+  let(:seed)           { FactoryBot.create :seed, crop: crop, owner: garden.owner }
+  let(:seed_photo)     { FactoryBot.create(:photo, owner: garden.owner) }
 
   describe "crops" do
     subject { crop_image_path(crop) }
@@ -22,7 +22,7 @@ describe PhotosHelper do
       before { planting.photos << planting_photo }
 
       it "uses planting photos" do
-        expect(subject).to eq planting_photo.thumbnail_url
+        expect(subject).to eq planting_photo.fullsize_url
       end
     end
 
@@ -30,7 +30,7 @@ describe PhotosHelper do
       before { harvest.photos << harvest_photo }
 
       it "uses harvest photos" do
-        expect(subject).to eq harvest_photo.thumbnail_url
+        expect(subject).to eq harvest_photo.fullsize_url
       end
     end
 
@@ -38,7 +38,7 @@ describe PhotosHelper do
       before { seed.photos << seed_photo }
 
       it "uses seed photos" do
-        expect(subject).to eq seed_photo.thumbnail_url
+        expect(subject).to eq seed_photo.fullsize_url
       end
     end
   end
@@ -48,10 +48,10 @@ describe PhotosHelper do
 
     it { is_expected.to eq 'placeholder_600.png' }
 
-    describe "uses garden's own photo" do
+    describe "has a flickr photo" do
+      let(:garden_photo)   { FactoryBot.create(:photo, owner: garden.owner, source: 'flickr') }
       before { garden.photos << garden_photo }
-
-      it { is_expected.to eq garden_photo.thumbnail_url }
+      it { is_expected.to eq garden_photo.fullsize_url }
     end
   end
 
@@ -59,10 +59,11 @@ describe PhotosHelper do
     subject { planting_image_path(planting) }
 
     it { is_expected.to eq 'placeholder_600.png' }
+
     describe "uses planting's own photo" do
       before { planting.photos << planting_photo }
 
-      it { is_expected.to eq planting_photo.thumbnail_url }
+      it { is_expected.to eq planting_photo.fullsize_url }
     end
   end
 
@@ -70,10 +71,11 @@ describe PhotosHelper do
     subject { harvest_image_path(harvest) }
 
     it { is_expected.to eq 'placeholder_600.png' }
+
     describe "uses harvest's own photo" do
       before { harvest.photos << harvest_photo }
 
-      it { is_expected.to eq harvest_photo.thumbnail_url }
+      it { is_expected.to eq harvest_photo.fullsize_url }
     end
   end
 
@@ -85,7 +87,7 @@ describe PhotosHelper do
     describe "uses seed's own photo" do
       before { seed.photos << seed_photo }
 
-      it { is_expected.to eq seed_photo.thumbnail_url }
+      it { is_expected.to eq seed_photo.fullsize_url }
     end
   end
 end
diff --git a/spec/views/crops/_planting_advice.html.haml_spec.rb b/spec/views/crops/_planting_advice.html.haml_spec.rb
deleted file mode 100644
index 59e635b45..000000000
--- a/spec/views/crops/_planting_advice.html.haml_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'rails_helper'
-
-describe "crops/_planting_advice" do
-  subject { rendered }
-
-  let(:planting) { FactoryBot.create(:planting) }
-
-  shared_context "render planting_advice" do
-    before { render 'crops/planting_advice', crop: planting.crop }
-  end
-
-  describe "sunniness" do
-    context "with no sunniness set" do
-      include_examples "render planting_advice"
-      it "doesn't show sunniness" do
-        expect(subject).to have_content "Plant in: not known."
-      end
-    end
-
-    context "with sunniness frequencies" do
-      before { FactoryBot.create(:sunny_planting, crop: planting.crop) }
-
-      include_examples "render planting_advice"
-      it { is_expected.to have_content "Plant in:" }
-      it { is_expected.to have_content "sun (1)" }
-    end
-
-    context "with multiple sunniness frequencies" do
-      before do
-        FactoryBot.create_list(:sunny_planting, 2, crop: planting.crop)
-        FactoryBot.create(:shady_planting, crop: planting.crop)
-      end
-
-      include_examples "render planting_advice"
-      it { is_expected.to have_content "Plant in:" }
-      it { is_expected.to have_content "sun (2), shade (1)" }
-    end
-  end
-
-  describe "planted from" do
-    context "when none are set" do
-      include_examples "render planting_advice"
-      it "doesn't show planted_from " do
-        expect(subject).to have_content "Plant from: not known."
-      end
-    end
-
-    context "with planted_from frequencies" do
-      before { FactoryBot.create(:seed_planting, crop: planting.crop) }
-
-      include_examples "render planting_advice"
-      it { is_expected.to have_content "Plant from:" }
-      it { is_expected.to have_content "seed (1)" }
-    end
-
-    context "with multiple planted_from frequencies" do
-      before do
-        FactoryBot.create_list(:seed_planting, 2, crop: planting.crop)
-        FactoryBot.create(:cutting_planting, crop: planting.crop)
-      end
-
-      include_examples "render planting_advice"
-      it { is_expected.to have_content "Plant from:" }
-      it { is_expected.to have_content "seed (2), cutting (1)" }
-    end
-  end
-end
diff --git a/spec/views/harvests/index.html.haml_spec.rb b/spec/views/harvests/index.html.haml_spec.rb
index 461749f0b..294256ade 100644
--- a/spec/views/harvests/index.html.haml_spec.rb
+++ b/spec/views/harvests/index.html.haml_spec.rb
@@ -27,7 +27,7 @@ describe "harvests/index" do
 
   it "provides data links" do
     render
-    rendered.should have_content "The data on this page is available in the following formats:"
+    expect(rendered).to have_content "The data on this page is available in the following formats:"
     assert_select "a", href: harvests_path(format: 'csv')
     assert_select "a", href: harvests_path(format: 'json')
   end
diff --git a/spec/views/harvests/show.html.haml_spec.rb b/spec/views/harvests/show.html.haml_spec.rb
index f3c17f2b5..4a8053924 100644
--- a/spec/views/harvests/show.html.haml_spec.rb
+++ b/spec/views/harvests/show.html.haml_spec.rb
@@ -14,7 +14,7 @@ describe "harvests/show" do
 
   describe "renders attributes" do
     it { is_expected.to have_content harvest.crop.name }
-    it { is_expected.to have_content harvest.harvested_at.to_s }
+    it { is_expected.to have_content I18n.l(harvest.harvested_at) }
     it { is_expected.to have_content harvest.plant_part.to_s }
   end
 end
diff --git a/spec/views/seeds/show.html.haml_spec.rb b/spec/views/seeds/show.html.haml_spec.rb
index 1c2e88442..34525fbb6 100644
--- a/spec/views/seeds/show.html.haml_spec.rb
+++ b/spec/views/seeds/show.html.haml_spec.rb
@@ -29,7 +29,7 @@ describe "seeds/show" do
       end
 
       it "shows tradable attributes" do
-        expect(rendered).to have_content "Will trade: locally"
+        expect(rendered).to have_content "Will trade locally"
       end
 
       it "shows button to send message" do

From 3eb30a55550de2a13e1bad724bc7ad7acdb44210 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 28 Sep 2019 17:44:37 +1200
Subject: [PATCH 050/142] Removed duplicate crop info

---
 app/views/crops/show.html.haml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index 68e841383..bb4a25287 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -14,25 +14,6 @@
   %li.breadcrumb-item.active= link_to @crop.name.capitalize, @crop
 
 = render 'approval_status_message', crop: @crop
-.jumbotron
-  .row
-    .col-md-9
-      %h1
-        %strong= @crop.name.capitalize
-        - unless @crop.approved?
-          %badge.badge-warning=@crop.approval_status
-        %small.text-muted= @crop.default_scientific_name
-      %p.text-muted
-        - if !@crop.plantings.empty?
-          #{@crop.name.capitalize} has been planted
-          = pluralize(@crop.plantings.size, "time")
-          by #{ENV['GROWSTUFF_SITE_NAME']} members.
-        - else
-          Nobody is growing this yet. You could be the first!
-    .col-md-3
-      = image_tag crop_image_path(@crop),
-        class: 'img-responsive shadow rounded crop-hero-photo', alt: 'photo of crop'
-
 .jumbotron= render 'crops/info'
 
 .row

From 0a7180723799c68269a2a6f18e81effa91fd1ceb Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 28 Sep 2019 18:38:58 +1200
Subject: [PATCH 051/142] Stop using rails-assets.org (#2194)

---
 Gemfile      | 2 +-
 Gemfile.lock | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2672e0aaf..98f5a7e7b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ gem 'gibbon', '~>1.2.0'            # for Mailchimp newsletter subscriptions
 
 # Maps
 gem 'leaflet-rails'
-gem 'rails-assets-leaflet.markercluster', source: 'https://rails-assets.org'
+gem 'rails-assets-leaflet.markercluster'
 
 gem 'pg', '< 1.0.0'                # Upstream bug, see https://github.com/Growstuff/growstuff/pull/1539
 gem 'ruby-units'                   # for unit conversion
diff --git a/Gemfile.lock b/Gemfile.lock
index 5dc18108e..b6eb02eaf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,5 @@
 GEM
   remote: https://rubygems.org/
-  remote: https://rails-assets.org/
   specs:
     abstract_type (0.0.7)
     actioncable (5.2.2.1)
@@ -632,7 +631,7 @@ DEPENDENCIES
   puma
   rack-protection (>= 2.0.1)
   rails (= 5.2.2.1)
-  rails-assets-leaflet.markercluster!
+  rails-assets-leaflet.markercluster
   rails-controller-testing
   rails_12factor
   rake (>= 10.0.0)

From f297fdc67793b4eda90c9e58d47707d053c35cca Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 5 Oct 2019 13:23:54 +1300
Subject: [PATCH 052/142] Inline editing and display tidy ups

---
 app/assets/images/icons/COPYRIGHT             |   1 +
 app/assets/images/icons/add-photo.svg         |   1 +
 app/assets/images/icons/ant.svg               |   1 +
 app/assets/images/icons/bee.svg               |   1 +
 app/assets/images/icons/bug.svg               |   1 +
 app/assets/images/icons/butterfly.svg         |   1 +
 app/assets/images/icons/cat.svg               |   1 +
 app/assets/images/icons/delete.svg            |  12 +-
 app/assets/images/icons/earth-worm.svg        |   1 +
 app/assets/images/icons/edit.svg              |   1 +
 app/assets/images/icons/finish.svg            |   1 +
 app/assets/images/icons/garden.svg            |  26 -----
 app/assets/images/icons/gardener.svg          |   1 +
 app/assets/images/icons/gardens.svg           |   1 +
 app/assets/images/icons/grass.svg             |   1 +
 app/assets/images/icons/harvest-add.svg       |  10 ++
 app/assets/images/icons/harvest.svg           |   6 +-
 app/assets/images/icons/home.svg              |   5 -
 app/assets/images/icons/hose.svg              |   1 +
 app/assets/images/icons/insect.svg            |   1 +
 app/assets/images/icons/ladybird.svg          |   1 +
 app/assets/images/icons/notification.svg      |   1 +
 app/assets/images/icons/photo.svg             |   1 +
 app/assets/images/icons/plant-seeds.svg       |   3 -
 app/assets/images/icons/plant_parts/bark.svg  |   1 +
 app/assets/images/icons/plant_parts/bulb.svg  |   1 +
 .../images/icons/plant_parts/flower.svg       |   1 +
 app/assets/images/icons/plant_parts/fruit.svg |   1 +
 .../images/icons/plant_parts/leaves.svg       |   1 +
 app/assets/images/icons/plant_parts/pod.svg   |   1 +
 app/assets/images/icons/plant_parts/seeds.svg |   1 +
 app/assets/images/icons/plant_parts/tuber.svg |   1 +
 app/assets/images/icons/planting-add.svg      |  13 +++
 app/assets/images/icons/planting-hand.svg     |   1 +
 app/assets/images/icons/planting-sun.svg      |   1 +
 app/assets/images/icons/planting.svg          |   6 +-
 app/assets/images/icons/post.svg              |   7 +-
 app/assets/images/icons/rabbit.svg            |   1 +
 app/assets/images/icons/seed-add.svg          |  15 +++
 app/assets/images/icons/seeds-colour.svg      |  18 ---
 app/assets/images/icons/seeds.svg             |  17 ++-
 app/assets/images/icons/slug-eating.svg       |   1 +
 app/assets/images/icons/slug.svg              |   1 +
 app/assets/images/icons/snail.svg             |   1 +
 app/assets/images/icons/spiderweb.svg         |   1 +
 app/assets/images/icons/sprinkler.svg         |   1 +
 app/assets/images/icons/sprout-add.svg        |  11 ++
 app/assets/images/icons/sprout.svg            |   1 +
 app/assets/images/icons/stones.svg            |   1 +
 app/assets/images/icons/timeline.svg          |  23 ++++
 app/assets/images/icons/watering-can.svg      |   1 +
 app/assets/images/icons/wheelbarrow.svg       |   1 +
 app/assets/javascripts/datepicker.js          |   3 +
 app/assets/javascripts/editable.js            |   6 +
 app/assets/javascripts/plantings.js.coffee    |   6 -
 app/assets/javascripts/seeds.js.coffee        |   6 -
 app/assets/stylesheets/_crops.scss            |  38 +++----
 app/assets/stylesheets/_harvests.scss         |  34 ++++++
 app/assets/stylesheets/_members.scss          |  15 ---
 app/assets/stylesheets/_seeds.scss            |  10 ++
 app/assets/stylesheets/_variables.scss        |   3 +-
 app/assets/stylesheets/overrides.scss         |  68 ++++++++---
 app/controllers/crops_controller.rb           |   5 +-
 app/controllers/gardens_controller.rb         |  16 +--
 app/controllers/harvests_controller.rb        |   6 +-
 app/controllers/plantings_controller.rb       |   1 +
 app/controllers/seeds_controller.rb           |  23 ++--
 app/helpers/application_helper.rb             |  14 +--
 app/helpers/buttons_helper.rb                 |   2 +-
 app/helpers/editable_form_helper.rb           |   6 +
 app/helpers/gardens_helper.rb                 |   4 -
 app/helpers/icons_helper.rb                   |  35 ++++--
 app/helpers/plantings_helper.rb               |   8 +-
 app/models/concerns/predict_planting.rb       |   4 +
 app/models/crop.rb                            |   7 +-
 app/models/harvest.rb                         |  12 +-
 app/models/photo.rb                           |   4 +-
 app/models/planting.rb                        |   2 +
 app/models/seed.rb                            |   2 +-
 app/views/crops/_actions.html.haml            |  38 ++++---
 app/views/crops/_form.html.haml               |   2 +
 app/views/crops/_hierarchy.html.haml          |   2 +
 app/views/crops/_info.haml                    |   7 +-
 app/views/crops/_posts.html.haml              |   4 +-
 app/views/crops/_predictions.html.haml        |  15 ++-
 app/views/crops/_tiny.html.haml               |   8 +-
 app/views/crops/index.html.haml               |  29 ++---
 app/views/crops/show.html.haml                |  40 ++++---
 app/views/gardens/index.html.haml             |  38 +++++--
 app/views/gardens/show.html.haml              |  22 ++--
 app/views/harvests/_card.html.haml            |   2 +-
 app/views/harvests/_thumbnail.html.haml       |  19 ++--
 app/views/harvests/index.html.haml            |   1 -
 app/views/harvests/show.html.haml             |  86 ++++++++------
 app/views/home/_blurb.html.haml               |   2 +-
 app/views/home/_crops.html.haml               |   2 +-
 app/views/home/index.html.haml                |  16 ++-
 app/views/layouts/_header.html.haml           |  64 ++++++++---
 app/views/layouts/_nav.haml                   |  28 +++--
 app/views/layouts/_pagination.html.haml       |   1 -
 app/views/layouts/application.html.haml       |  17 ++-
 app/views/layouts/modal.html.haml             |  11 ++
 app/views/members/_tiny.haml                  |   2 +-
 app/views/photos/_tiny.html.haml              |   3 +
 app/views/photos/show.html.haml               |  29 +++--
 app/views/plant_parts/index.html.haml         |  38 ++++---
 app/views/plantings/_badges.html.haml         |  10 +-
 app/views/plantings/_card.html.haml           |  14 +--
 app/views/plantings/_descendants.html.haml    |  12 +-
 app/views/plantings/_facts.haml               | 107 +++++++++++-------
 app/views/plantings/_harvests.html.haml       |  15 ++-
 app/views/plantings/_photos.haml              |   4 +-
 app/views/plantings/_progress.html.haml       |   9 +-
 app/views/plantings/_progress_list.haml       |  15 +++
 app/views/plantings/_quick_actions.haml       |  22 ++--
 app/views/plantings/_tiny.html.haml           |   4 +
 app/views/plantings/index.html.haml           |  32 +++---
 app/views/plantings/show.html.haml            |  16 ++-
 app/views/posts/_single.html.haml             |  29 -----
 app/views/posts/show.html.haml                |   4 +-
 app/views/scientific_names/_form.html.haml    |   2 +-
 app/views/seeds/_card.html.haml               |   6 +-
 app/views/seeds/_facts.html.haml              |  34 ++++--
 app/views/seeds/_seed.haml                    |   2 +-
 app/views/seeds/index.html.haml               |  44 +++----
 app/views/seeds/show.html.haml                | 107 +++++++++---------
 app/views/shared/_global_actions.html.haml    |  25 ----
 app/views/shared/_signin_signup.html.haml     |  13 +--
 app/views/shared/editable/_date.html.haml     |  11 ++
 app/views/shared/editable/_form.html.haml     |  18 +++
 config/locales/en.yml                         |   3 +
 .../charts/gardens_controller_spec.rb         |   4 +-
 spec/features/crops/crop_detail_page_spec.rb  |  12 +-
 spec/features/gardens/index_spec.rb           |  10 +-
 .../harvests/harvesting_a_crop_spec.rb        |  16 +--
 .../plantings/planting_a_crop_spec.rb         |  18 +--
 spec/features/plantings/show_spec.rb          |   8 +-
 spec/features/seeds/adding_seeds_spec.rb      |   7 +-
 spec/features/seeds/misc_seeds_spec.rb        |   3 +-
 spec/features/shared_examples/append_date.rb  |   3 +-
 spec/views/photos/index.html.haml_spec.rb     |   2 +-
 141 files changed, 1001 insertions(+), 716 deletions(-)
 create mode 100644 app/assets/images/icons/COPYRIGHT
 create mode 100644 app/assets/images/icons/add-photo.svg
 create mode 100644 app/assets/images/icons/ant.svg
 create mode 100644 app/assets/images/icons/bee.svg
 create mode 100644 app/assets/images/icons/bug.svg
 create mode 100644 app/assets/images/icons/butterfly.svg
 create mode 100644 app/assets/images/icons/cat.svg
 create mode 100644 app/assets/images/icons/earth-worm.svg
 create mode 100644 app/assets/images/icons/edit.svg
 create mode 100644 app/assets/images/icons/finish.svg
 delete mode 100644 app/assets/images/icons/garden.svg
 create mode 100644 app/assets/images/icons/gardener.svg
 create mode 100644 app/assets/images/icons/gardens.svg
 create mode 100644 app/assets/images/icons/grass.svg
 create mode 100644 app/assets/images/icons/harvest-add.svg
 delete mode 100644 app/assets/images/icons/home.svg
 create mode 100644 app/assets/images/icons/hose.svg
 create mode 100644 app/assets/images/icons/insect.svg
 create mode 100644 app/assets/images/icons/ladybird.svg
 create mode 100644 app/assets/images/icons/notification.svg
 create mode 100644 app/assets/images/icons/photo.svg
 delete mode 100644 app/assets/images/icons/plant-seeds.svg
 create mode 100644 app/assets/images/icons/plant_parts/bark.svg
 create mode 100644 app/assets/images/icons/plant_parts/bulb.svg
 create mode 100644 app/assets/images/icons/plant_parts/flower.svg
 create mode 100644 app/assets/images/icons/plant_parts/fruit.svg
 create mode 100644 app/assets/images/icons/plant_parts/leaves.svg
 create mode 100644 app/assets/images/icons/plant_parts/pod.svg
 create mode 100644 app/assets/images/icons/plant_parts/seeds.svg
 create mode 100644 app/assets/images/icons/plant_parts/tuber.svg
 create mode 100644 app/assets/images/icons/planting-add.svg
 create mode 100644 app/assets/images/icons/planting-hand.svg
 create mode 100644 app/assets/images/icons/planting-sun.svg
 create mode 100644 app/assets/images/icons/rabbit.svg
 create mode 100644 app/assets/images/icons/seed-add.svg
 delete mode 100644 app/assets/images/icons/seeds-colour.svg
 create mode 100644 app/assets/images/icons/slug-eating.svg
 create mode 100644 app/assets/images/icons/slug.svg
 create mode 100644 app/assets/images/icons/snail.svg
 create mode 100644 app/assets/images/icons/spiderweb.svg
 create mode 100644 app/assets/images/icons/sprinkler.svg
 create mode 100644 app/assets/images/icons/sprout-add.svg
 create mode 100644 app/assets/images/icons/sprout.svg
 create mode 100644 app/assets/images/icons/stones.svg
 create mode 100644 app/assets/images/icons/timeline.svg
 create mode 100644 app/assets/images/icons/watering-can.svg
 create mode 100644 app/assets/images/icons/wheelbarrow.svg
 create mode 100644 app/assets/javascripts/datepicker.js
 create mode 100644 app/assets/javascripts/editable.js
 delete mode 100644 app/assets/javascripts/plantings.js.coffee
 delete mode 100644 app/assets/javascripts/seeds.js.coffee
 create mode 100644 app/helpers/editable_form_helper.rb
 delete mode 100644 app/views/layouts/_pagination.html.haml
 create mode 100644 app/views/layouts/modal.html.haml
 create mode 100644 app/views/photos/_tiny.html.haml
 create mode 100644 app/views/plantings/_progress_list.haml
 create mode 100644 app/views/plantings/_tiny.html.haml
 delete mode 100644 app/views/shared/_global_actions.html.haml
 create mode 100644 app/views/shared/editable/_date.html.haml
 create mode 100644 app/views/shared/editable/_form.html.haml

diff --git a/app/assets/images/icons/COPYRIGHT b/app/assets/images/icons/COPYRIGHT
new file mode 100644
index 000000000..acf08b86d
--- /dev/null
+++ b/app/assets/images/icons/COPYRIGHT
@@ -0,0 +1 @@
+Icons in this folder attributable to Icons8.com. Used with permission.
diff --git a/app/assets/images/icons/add-photo.svg b/app/assets/images/icons/add-photo.svg
new file mode 100644
index 000000000..a3a042c10
--- /dev/null
+++ b/app/assets/images/icons/add-photo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#512DA8" d="M31.9,10H12.2l3.4-5.1c0.4-0.6,1-0.9,1.7-0.9h9.6c0.7,0,1.3,0.3,1.7,0.9L31.9,10z"/><path fill="#8668C5" d="M12,9H6V7.2C6,6.5,6.5,6,7.2,6h3.6C11.5,6,12,6.5,12,7.2V9z"/><path fill="#5E35B1" d="M38,40H6c-2.2,0-4-1.8-4-4V12c0-2.2,1.8-4,4-4h32c2.2,0,4,1.8,4,4v24C42,38.2,40.2,40,38,40"/><path fill="#512DA8" d="M10,24c0-6.6,5.4-12,12-12s12,5.4,12,12c0,6.6-5.4,12-12,12S10,30.6,10,24z"/><path fill="#B388FF" d="M22 15A9 9 0 1 0 22 33A9 9 0 1 0 22 15Z"/><path fill="#C7A7FF" d="M26.9,20.8c-1.2-1.4-3-2.2-4.8-2.2s-3.6,0.8-4.8,2.2c-0.5,0.5-0.4,1.3,0.1,1.8c0.5,0.5,1.3,0.4,1.8-0.1c1.5-1.7,4.3-1.7,5.8,0c0.3,0.3,0.6,0.4,1,0.4c0.3,0,0.6-0.1,0.9-0.3C27.4,22.2,27.4,21.4,26.9,20.8z"/><path fill="#8668C5" d="M9 9.9A2 1.5 0 1 0 9 12.9A2 1.5 0 1 0 9 9.9Z"/><path fill="#4CAF50" d="M36 26A10 10 0 1 0 36 46A10 10 0 1 0 36 26Z"/><path fill="#FFF" d="M42 34L38 34 38 30 34 30 34 34 30 34 30 38 34 38 34 42 38 42 38 38 42 38z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/ant.svg b/app/assets/images/icons/ant.svg
new file mode 100644
index 000000000..da94eac67
--- /dev/null
+++ b/app/assets/images/icons/ant.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M19,36c0,3.9,3,7,5,7s5-3.1,5-7s-1-7-5-7S19,32.1,19,36z"/><path fill="#795548" d="M21 21c0 1.7 1 10 3 10s3-8.3 3-10-1.3-3-3-3S21 19.3 21 21zM29 13c0 5-3 3-5 3s-5 2-5-3c0-2.8 2-7 5-7S29 10.2 29 13z"/><path fill="#5d4037" d="M14.3 18.8l6.7 3c0-.3 0-.6 0-.8 0-.5.1-.9.3-1.3l-5.6-2.5-4.8-6.8c-.3-.4-.9-.6-1.4-.2-.5.3-.6.9-.2 1.4L14.3 18.8zM27 21c0 .2 0 .5 0 .8l6.7-3 5.2-7.2c.3-.4.2-1.1-.2-1.4-.4-.3-1.1-.2-1.4.2l-4.8 6.8-5.6 2.5C26.9 20.1 27 20.5 27 21zM21.6 26c-.1-.7-.2-1.4-.3-2h-6.1l-5.8-2.9c-.5-.2-1.1 0-1.3.4-.2.5 0 1.1.4 1.3l6.2 3.1H21.6zM39.9 21.6c-.2-.5-.8-.7-1.3-.4L32.8 24h-6.1c-.1.6-.2 1.3-.3 2h6.9l6.2-3.1C39.9 22.6 40.1 22 39.9 21.6zM22.5 29.2c-.2-.5-.4-1-.5-1.6l-8.7 2.6-4.2 8.4c-.2.5 0 1.1.4 1.3C9.7 40 9.8 40 10 40c.4 0 .7-.2.9-.6l3.8-7.6 6.3-1.9C21.4 29.6 21.9 29.3 22.5 29.2zM34.7 30.2L26 27.6c-.2.6-.3 1.1-.5 1.6.6.2 1.1.4 1.5.8l6.3 1.9 3.8 7.6c.2.4.5.6.9.6.2 0 .3 0 .4-.1.5-.2.7-.8.4-1.3L34.7 30.2zM32.4 10H26c-.6 0-1-.4-1-1s.4-1 1-1h5.6l3.7-3.7c.4-.4 1-.4 1.4 0s.4 1 0 1.4L32.4 10zM22 10h-6.4l-4.3-4.3c-.4-.4-.4-1 0-1.4s1-.4 1.4 0L16.4 8H22c.6 0 1 .4 1 1S22.6 10 22 10z"/><path fill="#4e342e" d="M20.7 30.2c1 .5 2.1.8 3.3.8s2.3-.3 3.3-.8C26.6 29.4 25.5 29 24 29S21.4 29.4 20.7 30.2zM24 35c1.7 0 3.4-.4 4.9-1.2-.1-.7-.3-1.4-.5-2l-.1.1C27 32.6 25.5 33 24 33c-1.5 0-3-.4-4.3-1.1l-.1-.1c-.2.6-.4 1.3-.5 2C20.6 34.6 22.3 35 24 35zM24 37c-1.7 0-3.4-.4-5-1 0 0 0 0 0 0 0 .8.1 1.5.3 2.2 1.5.5 3.1.8 4.7.8s3.1-.3 4.7-.8c.2-.7.3-1.4.3-2.2 0 0 0 0 0 0C27.4 36.6 25.7 37 24 37zM28.2 39.5c-.2.4-.4.8-.7 1.1C26.3 40.9 25.2 41 24 41s-2.3-.1-3.5-.4c1 1.5 2.4 2.4 3.5 2.4C25.3 43 27.1 41.6 28.2 39.5zM24 18c-1.4 0-2.7 1-2.9 2.4 0 0 0 0 0 0 .7 0 1.3-.1 1.9-.2.4-.1.8-.2 1-.2s.6.1 1 .2c.6.1 1.2.2 1.9.2 0 0 0 0 0 0C26.7 19 25.4 18 24 18z"/><path fill="#4e342e" d="M24 16c-.3 0-.7.1-1 .1V19h2v-2.9C24.7 16.1 24.3 16 24 16zM26.1 5.9c0 .3.1.6.1.9C26.6 7.1 27 7.5 27.3 8L28 8c-.1-.5-.2-.9-.4-1.3-.2-.4-.4-.8-.6-1.2-.5-.7-1.2-1.3-2-1.5C25.6 4.5 25.9 5.2 26.1 5.9zM21.9 6.8c0-.3 0-.6.1-.9C22.1 5.2 22.4 4.5 23 4c-.8.2-1.5.8-2 1.5-.2.4-.5.8-.6 1.2C20.2 7.1 20.1 7.5 20 8l.7 0C21 7.5 21.4 7.1 21.9 6.8z"/><path d="M22 12c0 .6-.4 1-1 1s-1-.4-1-1 .4-1 1-1S22 11.4 22 12zM28 12c0 .6-.4 1-1 1s-1-.4-1-1 .4-1 1-1S28 11.4 28 12z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/bee.svg b/app/assets/images/icons/bee.svg
new file mode 100644
index 000000000..fa3cdfc99
--- /dev/null
+++ b/app/assets/images/icons/bee.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#42a5f5" d="M29.4,21L29.4,21c0,0-6.7-13.7-9.7-14.9c-1.9-0.7-3.5,6.2-0.8,10.4c2.2,3.6,9.1,5.8,9.1,5.8l0,0 c0.1,0,0.1,0.1,0.2,0.1c0.5,0.2,1.1-0.1,1.3-0.6C29.6,21.6,29.6,21.3,29.4,21z"/><path fill="#5d4037" d="M29.5 31.9C29.5 31.9 29.5 31.9 29.5 31.9c.1-.2.2-.4.2-.6 0 0 0 0 0 0 .2-.6.3-1.2.3-1.8 0-2.7-1.7-5-4-6-3.6-2.2-6.4-.2-8 2.5-.2.3-.4.6-.5 1C13.6 35.4 19.2 41.1 20 42c1.4-5.1 6.9-4.3 9.3-9.8C29.4 32.1 29.5 32 29.5 31.9L29.5 31.9zM35 14c-.2 0-.3 0-.4-.1-.5-.2-.7-.8-.4-1.3l1.2-2.4L40.8 9c.5-.1 1.1.2 1.2.8.1.5-.2 1.1-.8 1.2l-4.5.9-.8 1.6C35.7 13.8 35.4 14 35 14z"/><path fill="#5d4037" d="M33,13c-0.4,0-0.8-0.3-0.9-0.7l-1.3-3.9l6.9-2.3c0.5-0.2,1.1,0.1,1.3,0.6c0.2,0.5-0.1,1.1-0.6,1.3 l-5.1,1.7l0.7,2.1c0.2,0.5-0.1,1.1-0.6,1.3C33.2,13,33.1,13,33,13z"/><path fill="#ffc107" d="M26.8 35.6c.2-.2.4-.3.6-.5-2.1.5-4.3.5-6.3.2-1.1-.2-2.2-.5-3.3-.8-.5-.2-1.1-.4-1.6-.6.1 1.3.4 2.5.8 3.6.1 0 .1 0 .2 0 1.3.1 2.6 0 3.8-.1C23 37 25 36.4 26.8 35.6zM18.7 24.9c.4.5.9 1 1.4 1.5 1.1 1.1 2.3 2 3.6 2.7 1.3.8 2.7 1.3 4.1 1.6.7.1 1.4.2 2 .3 0-.2.1-.3.1-.5-1.9-.6-3.7-1.6-5.1-3-.9-.9-1.7-1.9-2.4-3-.3-.5-.6-1.1-.9-1.7 0 0 0 0 0-.1C20.4 23.1 19.5 23.9 18.7 24.9zM22.8 31.3c-1.2-.6-2.4-1.4-3.5-2.2-.7-.5-1.4-1.1-2-1.7-.5 1.2-.9 2.4-1 3.5.5.3 1 .5 1.5.7 1.4.6 2.9 1.1 4.3 1.5 2.1.5 4.4.7 6.5.4.1-.2.2-.3.3-.5C26.8 32.9 24.7 32.2 22.8 31.3z"/><path fill="#795548" d="M32.8,25.8c-2.1,2.1-4.7,1.3-6.8-0.8c-2.1-2.1-2.8-4.7-0.8-6.8c2.1-2.1,4.7-1.3,6.8,0.8 C34.1,21.1,34.8,23.7,32.8,25.8z"/><path fill="#8d6e63" d="M37.8,18.9c-0.9,2-4.8,1.1-7.4-0.1c-2-0.9-2.9-3.3-2-5.4c0.9-2.1,3.1-2.6,5.2-2.1 C36.1,12,38.7,16.8,37.8,18.9z"/><path fill="#4e342e" d="M32.6,19.6c-0.8-0.2-1.5-0.5-2.2-0.8c-0.8-0.4-1.4-1-1.8-1.7c-0.7-0.1-2.2,0-2.9,0.9 c0.6,1.4,0.8,3.5,2.3,4.1c2.9,1.1,4.8,0.7,5.9,0C33.6,21.2,33.2,20.4,32.6,19.6z"/><path fill="#3e2723" d="M35.4,17.3c-0.5,0.7-2,0.5-3.5-0.6s-2.3-2.6-1.8-3.3c0.5-0.7,2-0.5,3.5,0.6 C35.1,15.1,35.9,16.6,35.4,17.3z"/><path fill="#90caf9" d="M28.6,20.2L28.6,20.2C28.6,20.2,12.2,6,9,6c-2,0-1,7,3,10c3.4,2.5,15.8,6,15.8,6l0,0 c0.1,0,0.2,0.1,0.2,0.1c0.6,0,1-0.4,1-1C29,20.7,28.8,20.4,28.6,20.2z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/bug.svg b/app/assets/images/icons/bug.svg
new file mode 100644
index 000000000..bc5b5da5f
--- /dev/null
+++ b/app/assets/images/icons/bug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#455a64" d="M34.4 44.8l-3-2c-.2-.2-.4-.4-.4-.7l-.9-6.6-3.7-2.8 1.2-1.6 4 3c.2.2.4.4.4.7l.9 6.6 2.6 1.8L34.4 44.8zM35.3 33.7l-2-2c-.1-.1-.2-.3-.3-.5l-.8-3.4L27.8 27l.4-2 5 1c.4.1.7.4.8.7l.9 3.7 1.8 1.8L35.3 33.7zM29.4 22.9l-.7-1.9 3.9-1.6-2.4-4c-.2-.3-.2-.7 0-1.1l2-3 1.7 1.1L32.2 15l2.7 4.5c.2.3.2.6.1.8-.1.3-.3.5-.6.6L29.4 22.9zM13.6 44.8l-1.1-1.7 2.6-1.8.9-6.6c0-.3.2-.5.4-.7l4-3 1.2 1.6-3.7 2.8L17 42.1c0 .3-.2.5-.4.7L13.6 44.8zM12.7 33.7l-1.4-1.4 1.8-1.8.9-3.7c.1-.4.4-.7.8-.7l5-1 .4 2-4.4.9L15 31.2c0 .2-.1.3-.3.5L12.7 33.7zM18.6 22.9l-5-2c-.3-.1-.5-.3-.6-.6C13 20 13 19.7 13.1 19.5l2.7-4.5-1.6-2.5 1.7-1.1 2 3c.2.3.2.7 0 1.1l-2.4 4 3.9 1.6L18.6 22.9z"/><path fill="#4db6ac" d="M26 14h-2C24 4.2 38.3 3 38.9 3l.1 2C38.9 5 26 6 26 14zM24 14h-2C22 6 9.1 5 8.9 5l.1-2C9.7 3 24 4.2 24 14z"/><path fill="#00695c" d="M27,20.8c0,1.7-1.4,3-3,3s-3-1.4-3-3V15c0-1.7,1.4-3,3-3s3,1.4,3,3V20.8z"/><path fill="#26a69a" d="M24,42c-6,0-7-22-7-22c0-1.1,4-2,7-2s7,0.9,7,2C31,20,30,42,24,42z"/><path fill="#00897b" d="M23,41.8c0.3,0.1,0.6,0.2,1,0.2s0.7-0.1,1-0.2V18c-0.3,0-0.7,0-1,0s-0.7,0-1,0V41.8z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/butterfly.svg b/app/assets/images/icons/butterfly.svg
new file mode 100644
index 000000000..551cc7323
--- /dev/null
+++ b/app/assets/images/icons/butterfly.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#37474F" d="M25 29c0 .553-.447 1-1 1l0 0c-.553 0-1-.447-1-1V19c0-.553.447-1 1-1l0 0c.553 0 1 .447 1 1V29zM24 16A1 1 0 1 0 24 18 1 1 0 1 0 24 16z"/><path fill="#2962FF" d="M25 20h6c0 0 6 0 6 5s-3 7-3 7-2.705 3.25-3.251 2.336C28.628 30.782 25 22.795 25 22V20zM23.082 20h-6c0 0-6 0-6 5s3 7 3 7 2.705 3.25 3.251 2.336c2.121-3.554 5.749-11.541 5.749-12.336V20z"/><path fill="#448AFF" d="M36.792 6.918C37 6.625 38.609 6 39 6c-8 0-14 11-14 13 0 .5 0 .813 0 1 0 0 7.802 0 11 0 0-.637 0-1.363 0-2C36 18 37.5 14.418 36.792 6.918zM11.29 6.918C11.082 6.625 9.473 6 9.082 6c8 0 14 11 14 13 0 .5 0 .813 0 1 0 0-7.802 0-11 0 0-.637 0-1.363 0-2C12.082 18 10.582 14.418 11.29 6.918z"/><g><path fill="#263238" d="M39 6c-.391 0-2 .625-2.208.918C37.5 14.418 36 18 36 18c0 .637 0 1.363 0 2 .422 0 .767 0 1 0 3 0 3-2 3-2s.418-4.707 1.417-6.707C42.583 8.959 43 8 43 8S44 6 39 6zM9.082 6c.391 0 2 .625 2.208.918C10.582 14.418 12.082 18 12.082 18c0 .637 0 1.363 0 2-.422 0-.767 0-1 0-3 0-3-2-3-2s-.418-4.707-1.417-6.707C5.499 8.959 5.082 8 5.082 8S4.082 6 9.082 6z"/></g><g><path fill="#455A64" d="M33.25,19.043c0.607-0.296,1.144-0.428,1.672-0.529c0.525-0.092,1.031-0.127,1.533-0.121c0.501,0.006,0.997,0.057,1.51,0.15c0.517,0.105,1.037,0.229,1.661,0.5c-0.413,0.541-0.95,0.85-1.5,1.064c-0.553,0.205-1.13,0.294-1.699,0.284c-0.57-0.009-1.135-0.114-1.675-0.32C34.216,19.852,33.689,19.563,33.25,19.043z"/><path fill="#455A64" d="M33.542,17c0.48-0.643,0.979-0.982,1.481-1.232c0.503-0.236,1.012-0.354,1.523-0.368c0.513-0.015,1.029,0.079,1.546,0.294c0.516,0.226,1.036,0.549,1.533,1.182c-0.517,0.615-1.011,0.939-1.51,1.176c-0.497,0.226-0.995,0.338-1.497,0.348s-1.007-0.078-1.518-0.281C34.59,17.902,34.074,17.599,33.542,17z"/><path fill="#455A64" d="M33.667,15c0.309-0.787,0.742-1.293,1.21-1.709c0.474-0.404,0.995-0.693,1.554-0.879c0.558-0.187,1.156-0.266,1.788-0.217c0.631,0.061,1.303,0.223,1.99,0.723c-0.437,0.724-0.874,1.171-1.345,1.545c-0.47,0.363-0.966,0.625-1.495,0.797c-0.529,0.173-1.091,0.26-1.695,0.243C35.065,15.476,34.425,15.369,33.667,15z"/><path fill="#455A64" d="M34,12c0.355-0.805,0.829-1.328,1.335-1.766c0.511-0.426,1.066-0.739,1.659-0.953c0.593-0.215,1.224-0.328,1.892-0.322c0.672,0.017,1.377,0.127,2.156,0.541c-0.411,0.779-0.891,1.276-1.399,1.693c-0.511,0.404-1.056,0.705-1.636,0.91c-0.58,0.207-1.193,0.322-1.85,0.332C35.497,12.436,34.805,12.353,34,12z"/><path fill="#455A64" d="M33 10c.233-1.002.813-1.75 1.468-2.363.668-.604 1.454-1.053 2.298-1.336.843-.285 1.748-.395 2.646-.312C40.309 6.089 41.205 6.358 42 7c-.818.609-1.535.984-2.233 1.32C39.07 8.653 38.4 8.918 37.715 9.146c-.687.227-1.388.414-2.145.566C34.805 9.861 34.008 9.971 33 10zM14.832 19.043c-.439.521-.966.809-1.502 1.028-.54.206-1.104.312-1.675.32-.569.01-1.146-.079-1.699-.284-.55-.215-1.087-.523-1.5-1.064.624-.271 1.145-.395 1.661-.5.513-.094 1.009-.145 1.51-.15.502-.006 1.008.029 1.533.121C13.688 18.615 14.225 18.747 14.832 19.043z"/><path fill="#455A64" d="M14.54,17c-0.532,0.599-1.048,0.902-1.56,1.117c-0.511,0.203-1.016,0.291-1.518,0.281s-1-0.122-1.497-0.348c-0.499-0.236-0.993-0.561-1.51-1.176c0.497-0.633,1.018-0.956,1.533-1.182c0.517-0.215,1.033-0.309,1.546-0.294c0.512,0.015,1.021,0.132,1.523,0.368C13.561,16.018,14.06,16.357,14.54,17z"/><path fill="#455A64" d="M14.415,15c-0.758,0.369-1.398,0.476-2.007,0.503c-0.604,0.017-1.166-0.07-1.695-0.243c-0.529-0.172-1.025-0.434-1.495-0.797c-0.471-0.374-0.908-0.821-1.345-1.545c0.688-0.5,1.359-0.662,1.99-0.723c0.632-0.049,1.23,0.03,1.788,0.217c0.559,0.186,1.08,0.475,1.554,0.879C13.673,13.707,14.106,14.213,14.415,15z"/><path fill="#455A64" d="M14.082,12c-0.805,0.353-1.497,0.436-2.157,0.436c-0.656-0.01-1.27-0.125-1.85-0.332c-0.58-0.205-1.125-0.506-1.636-0.91C7.931,10.776,7.451,10.279,7.04,9.5c0.779-0.414,1.484-0.524,2.156-0.541c0.668-0.006,1.299,0.107,1.892,0.322c0.593,0.214,1.148,0.527,1.659,0.953C13.253,10.672,13.727,11.195,14.082,12z"/><path fill="#455A64" d="M15.082,10c-1.008-0.029-1.805-0.139-2.57-0.287c-0.757-0.152-1.458-0.34-2.145-0.566C9.682,8.918,9.012,8.653,8.315,8.32C7.617,7.984,6.9,7.609,6.082,7c0.795-0.642,1.691-0.911,2.589-1.011c0.897-0.083,1.803,0.026,2.646,0.312c0.844,0.283,1.63,0.732,2.298,1.336C14.269,8.25,14.849,8.998,15.082,10z"/></g><g><path fill="#37474F" d="M14.082 32c0 0-3-2-3-7s6-5 6-5h-4c0 0-4 0-4 5s3 9 3 9 2 3 4 2c.258-.129.703-.751 1.246-1.659C16.772 35.231 14.082 32 14.082 32zM35 20h-4c0 0 6 0 6 5s-3 7-3 7-2.69 3.231-3.246 2.341C31.297 35.249 31.742 35.871 32 36c2 1 4-2 4-2s3-4 3-9S35 20 35 20zM41.561 38.439c.604.568.586 1.535 0 2.121s-1.54.591-2.121 0c-.643-.654-.783-3.107-.783-3.107S40.828 37.75 41.561 38.439z"/><path fill="#37474F" d="M39 39.641c-.578-2.031-3.75-4.531-5.109-3.703-.859.234 3.828-6.063 3.609-4.547-1.188 2.156 1.938 5.969 3.625 6.766C40.953 38.625 39.594 39.75 39 39.641zM35 26c.42-.562.862-.784 1.289-.889.427-.092.851-.03 1.232.179.379.206.726.576.895 1.085C38.579 26.873 38.543 27.542 38 28c-.689-.16-1.047-.061-1.317-.025-.262.042-.439.04-.614-.061-.172-.098-.338-.28-.513-.569C35.38 27.044 35.206 26.662 35 26z"/><path fill="#37474F" d="M34,28c0.646-0.323,1.14-0.384,1.583-0.365c0.437,0.029,0.811,0.163,1.125,0.385c0.314,0.223,0.569,0.538,0.744,0.954c0.162,0.423,0.282,0.94,0.11,1.651c-0.696,0.19-1.149,0.24-1.566,0.205c-0.407-0.04-0.746-0.163-1.032-0.37s-0.521-0.493-0.695-0.877C34.099,29.188,33.976,28.721,34,28z"/><path fill="#37474F" d="M33,30c0.728-0.069,1.219,0.043,1.638,0.209c0.409,0.174,0.726,0.419,0.961,0.726c0.236,0.306,0.389,0.675,0.448,1.116c0.051,0.447,0.028,0.95-0.234,1.637c-0.731,0.071-1.223-0.04-1.641-0.207c-0.409-0.174-0.726-0.419-0.958-0.728c-0.233-0.309-0.386-0.678-0.445-1.118C32.719,31.187,32.741,30.684,33,30z"/><path fill="#37474F" d="M31 31c.666.355 1.076.613 1.415.865.33.248.562.471.734.711.175.241.281.506.397.869L34 35c-.619.447-1.282.488-1.871.33-.588-.164-1.096-.544-1.428-1.021-.337-.477-.506-1.045-.487-1.618C30.248 32.118 30.433 31.519 31 31zM6.521 38.439c-.604.568-.586 1.535 0 2.121s1.54.591 2.121 0c.643-.654.783-3.107.783-3.107S7.254 37.75 6.521 38.439z"/><path fill="#37474F" d="M9.082 39.641c.578-2.031 3.75-4.531 5.109-3.703.859.234-3.828-6.063-3.609-4.547 1.188 2.156-1.938 5.969-3.625 6.766C7.129 38.625 8.488 39.75 9.082 39.641zM13.082 26c-.206.662-.38 1.044-.556 1.345-.175.289-.34.472-.513.569-.174.101-.353.103-.613.061-.271-.035-.628-.135-1.318.025-.543-.458-.579-1.127-.416-1.625.169-.509.516-.879.895-1.085.382-.209.805-.271 1.232-.179C12.22 25.216 12.662 25.438 13.082 26z"/><path fill="#37474F" d="M14.082,28c0.024,0.721-0.099,1.188-0.268,1.583c-0.176,0.384-0.41,0.67-0.696,0.877s-0.625,0.33-1.032,0.37c-0.417,0.035-0.87-0.015-1.566-0.205c-0.171-0.711-0.052-1.229,0.11-1.651c0.175-0.416,0.43-0.731,0.744-0.954c0.315-0.222,0.688-0.355,1.125-0.385C12.942,27.616,13.436,27.677,14.082,28z"/><path fill="#37474F" d="M15.082,30c0.259,0.684,0.281,1.187,0.231,1.635c-0.06,0.44-0.212,0.81-0.445,1.118c-0.232,0.309-0.548,0.554-0.958,0.728c-0.418,0.167-0.91,0.278-1.641,0.207c-0.262-0.687-0.285-1.189-0.235-1.637c0.06-0.441,0.212-0.811,0.449-1.116c0.236-0.307,0.552-0.552,0.961-0.726C13.864,30.043,14.354,29.931,15.082,30z"/><path fill="#37474F" d="M17.082 31c.567.519.752 1.118.786 1.69.02.573-.15 1.142-.487 1.618-.332.478-.839.857-1.427 1.021-.589.158-1.252.117-1.871-.33l.454-1.555c.115-.363.222-.628.396-.869.173-.24.405-.463.734-.711C16.006 31.613 16.417 31.355 17.082 31zM34.962 21.108c-.694-.454-1.455-.796-2.273-1.011C32.533 20.06 32.375 20.03 32.216 20H30c.44.904.965 1.554 1.522 2.139.562.574 1.159 1.058 1.794 1.477.635.419 1.308.769 2.039 1.06.742.285 1.517.522 2.52.637-.125-1.006-.558-1.807-1.069-2.499C36.282 22.129 35.655 21.561 34.962 21.108zM15.394 20.098c-.819.214-1.58.557-2.273 1.011-.694.453-1.321 1.021-1.844 1.706-.513.692-.945 1.493-1.07 2.499 1.003-.115 1.777-.352 2.519-.637.732-.291 1.405-.64 2.04-1.06.635-.418 1.232-.903 1.794-1.477.558-.585 1.083-1.235 1.522-2.139h-2.215C15.708 20.03 15.549 20.06 15.394 20.098z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/cat.svg b/app/assets/images/icons/cat.svg
new file mode 100644
index 000000000..14fe24a4f
--- /dev/null
+++ b/app/assets/images/icons/cat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#455A64" d="M33.906,27.118C33.474,23.776,31.156,12,20,12c0,0-3.554,0.003-6.196,3.727c-0.079-0.094-0.144-0.178-0.244-0.287C13.545,15.423,12,13.813,12,11.5C12,9.288,14.432,7,18.5,7c4.5,0,5.635,1.928,5.654,1.975c0.262,0.785,1.114,1.214,1.897,0.948c0.786-0.262,1.21-1.111,0.948-1.897C26.945,7.861,25,4,18.5,4C12.554,4,9,7.813,9,11.5c0,3.58,2.34,5.961,2.439,6.061c0.34,0.339,0.643,0.617,0.929,0.87c-0.746,1.905-1.261,4.381-1.35,7.583L11,26v16c0,0,0,0,2,0s2,0,2,0v-5c0,0,1-9,4-9s3,4,3,4v10c0,0,0,0,2,0s2,0,2,0V32c0,0,0-1.999,2-1.999S30,32,30,32v10c0,0,0,0,2,0s2,0,2,0V32v-4v-0.999L33.906,27.118z"/><path fill="#455A64" d="M32.22 15A6.5 6.5 0 1 0 32.22 28A6.5 6.5 0 1 0 32.22 15Z"/><path fill="#37474F" d="M38.307 19.236c.496-1.729 1.035-4.369.413-6.236l-3.591 2.693C36.589 16.426 37.731 17.691 38.307 19.236zM29.481 15.611L26 13c-.575 1.725-.158 4.108.301 5.825C26.941 17.409 28.073 16.267 29.481 15.611z"/><g><path fill="#FFEB3B" d="M36.72 19c0 0 .292 3-1.5 3-.827 0-1.499 0-1.499 0s-.334-3 1.499-3C36.048 19 36.72 19 36.72 19zM27.72 19.002c0 0-.374 2.998 1.5 2.998.828 0 1.5.002 1.5.002S31.096 19 29.22 19C28.392 19 27.72 19.002 27.72 19.002z"/></g><g><path fill="#263238" d="M26 42c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2H26zM15 42c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2H15zM34 42c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2H34zM32.22 28c-2.236 0-4.209-1.13-5.378-2.851-.16-.235-.301-.485-.43-.742-.026-.054-.053-.108-.078-.163-.241-.516-.416-1.069-.515-1.648-.012-.069-.022-.138-.032-.208-.039-.292-.067-.587-.067-.889 0-.953.215-1.853.583-2.668-.001-.002-.001-.005-.002-.007 0-.001.001-.001.001-.002-.209-.789-.409-1.719-.509-2.66-.002-.013-.004-.026-.005-.039-.098-.952-.091-1.914.114-2.754-.578-.302-1.199-.56-1.863-.77-.562 1.931-.262 4.268.169 6.105-.312.875-.488 1.813-.488 2.795 0 4.688 3.813 8.5 8.5 8.5.61 0 1.206-.068 1.78-.191v-2.062C33.434 27.908 32.838 28 32.22 28z"/><path fill="#263238" d="M32.72,24c0,0-0.542,0.75-1,0l-1-0.998v-1L33.721,22v1L32.72,24z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/delete.svg b/app/assets/images/icons/delete.svg
index 899b79b86..458ebd746 100644
--- a/app/assets/images/icons/delete.svg
+++ b/app/assets/images/icons/delete.svg
@@ -1,11 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="96px" height="96px">
-<g id="surface1">
-<path style=" fill:#9FA8DA;" d="M 12 13 L 12 38 C 12 40.210938 13.789063 42 16 42 L 32 42 C 34.210938 42 36 40.210938 36 38 L 36 13 Z "/>
-<path style=" fill:#7986CB;" d="M 23 15 L 25 15 L 25 38 L 23 38 Z "/>
-<path style=" fill:#7986CB;" d="M 29 15 L 31 15 L 31 38 L 29 38 Z "/>
-<path style=" fill:#7986CB;" d="M 17 15 L 19 15 L 19 38 L 17 38 Z "/>
-<path style=" fill:#5C6BC0;" d="M 10 11 L 38 11 L 38 15 L 10 15 Z "/>
-<path style=" fill:#5C6BC0;" d="M 21.800781 13.027344 C 21.308594 12.492188 21 11.785156 21 11 C 21 9.34375 22.34375 8 24 8 C 25.65625 8 27 9.34375 27 11 C 27 11.785156 26.691406 12.492188 26.199219 13.027344 L 28.5625 13.027344 C 28.839844 12.40625 29 11.722656 29 11 C 29 8.238281 26.761719 6 24 6 C 21.238281 6 19 8.238281 19 11 C 19 11.722656 19.160156 12.40625 19.4375 13.027344 Z "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#ff3d00" d="M34,11l-6-6h-8l-6,6h-3v28c0,2.2,1.8,4,4,4h18c2.2,0,4-1.8,4-4V11H34z"/><path fill="#ff6e40" d="M11,7h26c1.1,0,2,0.9,2,2v2H9V9C9,7.9,9.9,7,11,7z"/><path fill="#fafafa" d="M15.515 25H32.486000000000004V29H15.515z" transform="rotate(-45.001 24 27)"/><path fill="#fafafa" d="M22 18.515H26V35.486000000000004H22z" transform="rotate(-45.001 24 27)"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/earth-worm.svg b/app/assets/images/icons/earth-worm.svg
new file mode 100644
index 000000000..e5e9b1f13
--- /dev/null
+++ b/app/assets/images/icons/earth-worm.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#ef9a9a" d="M35.018 34.126c-2.546-.192-6.051 1.718-7.434 2.939-2.035-.094-4.119-.123-5.881.17-1.252-.665-3.652-1.256-5.101-1.347-.31-.441-.68-.838-1.041-1.227-.752-.807-1.401-1.504-1.401-2.388l-8.832-2.847C5.113 30.292 5 31.276 5 32.274 5 40.997 11.889 46 23.9 46c4.289 0 9.829-1.611 12.547-5.225.687-.953 2.086-3.07 1.053-5.153C37.166 35.002 36.465 34.239 35.018 34.126zM39.006 6.987c-1.39-2.409-4.498-4.6-9.373-4.002-4.736-2.198-8.342-.257-9.879 1.35-1.332.178-2.902 1.274-2.911 1.281-1.67 1.233-2.328 2.48-2.67 4.769-.169 1.031.114 2.004.775 2.669.761.768 1.979 1.008 3.311.674 1.281-.281 2.183-.706 3.177-1.243.911-.493 1.772-.959 2.779-1.18 3.076-.678 7.137-.188 8.914 2.007.41.578.605 1.227.482 1.558-.367.925-2.058 1.4-3.177 1.715l-.304.087c-2.162.519-4.22.928-6.129 1.294l-1.074.214c-3.256.644-6.946 1.375-10.097 2.869l.429.903 0 .001 3.779 5.711c0 0 .551 1.048.921 1.048 1.862 0 4.3-.47 6.254-1.61 1.763.149 6.246-.408 8.326-1.726 2.135.065 4.613-.855 6.431-2.422 1.312-1.13 2.14-2.499 2.375-3.906C42.949 17.832 43 14.899 43 14.537 43 10.033 40.722 7.642 39.006 6.987z"/><path fill="#e98888" d="M34.76 12.15l-.04-.05-.04-.05c-1.56-1.92-4.4-3.03-7.79-3.03-1.07 0-2.11.11-3.1.33-1.29.28-2.31.84-3.31 1.38-.94.51-1.64.82-2.65 1.04l-.03.01-.03.01c-.23.06-.45.09-.65.09s-1.87.057-2.95-1.5c-.17 1.04.12 2.01.78 2.67.53.55 1.3.82 2.17.82.36 0 .75-.04 1.14-.14 1.28-.28 2.18-.71 3.18-1.25.91-.49 1.77-.95 2.77-1.18.85-.18 1.76-.28 2.68-.28 2.45 0 4.95.7 6.24 2.29.41.58.6 1.23.48 1.56-.37.92-2.06 1.4-3.18 1.71l-.3.09c-2.16.52-4.22.93-6.13 1.3l-1.07.21c-3.26.64-6.95 1.37-10.1 2.87l.857 2.013 2.023-1.033c2.46-.87 5.16-1.4 7.61-1.89l1.06-.21c1.93-.37 4.02-.79 6.22-1.31l.04-.01.04-.02.3-.08c1.49-.42 3.76-1.06 4.51-2.94C36.03 14.11 35.07 12.59 34.76 12.15zM37.5 35.62c-.958 2.07-1.809 2.893-2.65 3.95C32.479 42.547 27.57 44 23.9 44 17.59 44 7 42.48 7 32.27l.083-.77L5.33 29.43C5.11 30.29 5 31.28 5 32.27 5 41 11.89 46 23.9 46c4.29 0 9.83-1.61 12.55-5.22C37.13 39.82 38.53 37.71 37.5 35.62z"/><path fill="#e67a7a" d="M13.152,20.9c-4.191,0.301-6.373,2.483-7.262,4.485c-0.911,2.052-0.962,2.64-0.804,5.389 c3.934,2.501,9.189,2.138,9.189,2.138c2-1.297,3.376-2.9,3.718-4.201C17.021,24.047,13.152,20.9,13.152,20.9z"/><path fill="#e57373" d="M29.43 42.67c-.19.15-.41.22-.63.22-.27 0-.53-.11-.72-.33-.44-.52-.97-2.07-1.27-3.54-.14-.71-.23-1.41-.23-1.95v-.04c.33.01.67.02 1 .04.21-.19.48-.4.79-.61.13.16.21.38.21.61 0 .47.08 1.05.2 1.63.25 1.16.65 2.31.84 2.58C29.92 41.72 29.85 42.35 29.43 42.67zM22.68 37.1c.04.22 0 .46-.13.67-.19.3-.39.83-.56 1.42-.35 1.19-.62 2.63-.62 2.99 0 .55-.45 1-1 1s-1-.45-1-1c0-.56.29-2.16.71-3.56.21-.7.45-1.34.7-1.79.35.13.66.26.92.4C22.02 37.18 22.34 37.14 22.68 37.1zM17.59 36c-.03.29-.2.56-.46.73-.37.23-.8.58-1.24.95-.94.81-1.86 1.76-2.03 2.06-.19.33-.54.53-.9.53-.15 0-.3-.03-.44-.11-.47-.24-.69-.79-.47-1.27.24-.52 1.22-1.54 2.22-2.43.61-.55 1.22-1.04 1.7-1.35.22.25.44.51.63.78C16.89 35.91 17.23 35.95 17.59 36zM25.21 27.101v.01c-.38.02-.72.01-1-.01-.28.17-.58.32-.88.46-.08-.14-.12-.29-.12-.46 0-1.83-.5-4.76-.66-5.24-.17-.52.12-1.08.64-1.25.53-.17 1.09.11 1.26.64C24.68 21.951 25.21 25.071 25.21 27.101zM33.54 25.341c-.34.04-.67.05-1 .04-.26.16-.55.32-.88.46h-.01c-.07-.14-.11-.29-.11-.46 0-1.64-.84-4.56-1.06-5.01-.24-.5-.03-1.1.46-1.34.5-.24 1.1-.04 1.34.46C32.66 20.251 33.53 23.421 33.54 25.341zM42.03 18.311c-.19.28-.41.54-.68.74-.06.32-.14.64-.26.96-.21-.05-.4-.17-.54-.36-.76-.99-2.89-2.21-3.62-2.39-.54-.13-.86-.68-.73-1.21.13-.54.67-.87 1.21-.73C38.51 15.591 40.94 16.981 42.03 18.311zM39.87 7.452c-.1.2-.27.37-.5.46-.47.2-2.25 1.84-2.68 2.39-.2.25-.49.38-.78.38-.22 0-.44-.07-.62-.21-.44-.35-.51-.98-.17-1.41.37-.46 2.24-2.35 3.32-2.92.22.28.41.56.57.84C39.28 7.092 39.58 7.242 39.87 7.452zM30.6 3.232c-.33 1.28-.46 3.49-.38 3.99.08.54-.29 1.05-.84 1.14-.05.01-.1.01-.15.01-.48 0-.91-.35-.99-.85-.13-.85.05-3.33.43-4.79.01-.05.03-.09.04-.13.3.11.61.24.92.38.34-.04.67-.07.99-.08C30.64 3.012 30.63 3.122 30.6 3.232zM22.62 9.162c-.19.14-.4.21-.62.21-.3 0-.59-.13-.79-.38-.31-.41-2.17-3.34-2.42-4.4.32-.12.64-.22.96-.26.21-.22.46-.45.75-.66.11.12.19.28.23.46.15.56 1.67 3.13 2.06 3.62C23.13 8.192 23.05 8.822 22.62 9.162zM14.78 22.53c0 0-7.197 1.262-7.71 9.24-.761-.323-1.34-.59-1.98-1-.16-2.74-.11-3.33.8-5.38.89-2.01 3.07-4.19 7.26-4.49C13.15 20.9 13.87 21.49 14.78 22.53z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/edit.svg b/app/assets/images/icons/edit.svg
new file mode 100644
index 000000000..de8a6230b
--- /dev/null
+++ b/app/assets/images/icons/edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#E57373" d="M42.583,9.067l-3.651-3.65c-0.555-0.556-1.459-0.556-2.015,0l-1.718,1.72l5.664,5.664l1.72-1.718C43.139,10.526,43.139,9.625,42.583,9.067"/><path fill="#FF9800" d="M4.465 21.524H40.471999999999994V29.535H4.465z" transform="rotate(134.999 22.469 25.53)"/><path fill="#B0BEC5" d="M34.61 7.379H38.616V15.392H34.61z" transform="rotate(-45.02 36.61 11.385)"/><path fill="#FFC107" d="M6.905 35.43L5 43 12.571 41.094z"/><path fill="#37474F" d="M5.965 39.172L5 43 8.827 42.035z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/finish.svg b/app/assets/images/icons/finish.svg
new file mode 100644
index 000000000..37ff43b0e
--- /dev/null
+++ b/app/assets/images/icons/finish.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#9fa8da" d="M9,45H6V12c0,0,0.584-5,1.542-5S9,12,9,12V45z"/><path fill="#9fa8da" d="M7.5 3A2.5 2.5 0 1 0 7.5 8A2.5 2.5 0 1 0 7.5 3Z"/><path fill="#e0dddc" d="M6 9H42V33H6z"/><path fill="#546e7a" d="M12 9H18V15H12zM18 15H24V21H18zM36 9H42V15H36zM24 9H30V15H24zM30 15H36V21H30zM12 21H18V27H12zM18 27H24V33H18zM6 15H12V21H6zM6 27H12V33H6zM36 21H42V27H36zM24 21H30V27H24zM30 27H36V33H30z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/garden.svg b/app/assets/images/icons/garden.svg
deleted file mode 100644
index 11b9396f7..000000000
--- a/app/assets/images/icons/garden.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" fill:#2E7D32;" d="M 30 11.5 C 30 14.539063 27.539063 17 24.5 17 C 21.460938 17 19 14.539063 19 11.5 C 19 8.460938 21.460938 6 24.5 6 C 27.539063 6 30 8.460938 30 11.5 Z "/>
-<path style=" fill:#2E7D32;" d="M 41 16.5 C 41 18.984375 38.984375 21 36.5 21 C 34.015625 21 32 18.984375 32 16.5 C 32 14.015625 34.015625 12 36.5 12 C 38.984375 12 41 14.015625 41 16.5 Z "/>
-<path style=" fill:#388E3C;" d="M 22 14 C 22 16.761719 19.761719 19 17 19 C 14.238281 19 12 16.761719 12 14 C 12 11.238281 14.238281 9 17 9 C 19.761719 9 22 11.238281 22 14 Z "/>
-<path style=" fill:#388E3C;" d="M 12 19.5 C 12 21.433594 10.433594 23 8.5 23 C 6.566406 23 5 21.433594 5 19.5 C 5 17.566406 6.566406 16 8.5 16 C 10.433594 16 12 17.566406 12 19.5 Z "/>
-<path style=" fill:#388E3C;" d="M 43 19.5 C 43 21.433594 41.433594 23 39.5 23 C 37.566406 23 36 21.433594 36 19.5 C 36 17.566406 37.566406 16 39.5 16 C 41.433594 16 43 17.566406 43 19.5 Z "/>
-<path style=" fill:#388E3C;" d="M 35 14 C 35 16.761719 32.761719 19 30 19 C 27.238281 19 25 16.761719 25 14 C 25 11.238281 27.238281 9 30 9 C 32.761719 9 35 11.238281 35 14 Z "/>
-<path style=" fill:#4CAF50;" d="M 26 19 C 26 21.761719 23.761719 24 21 24 C 18.238281 24 16 21.761719 16 19 C 16 16.238281 18.238281 14 21 14 C 23.761719 14 26 16.238281 26 19 Z "/>
-<path style=" fill:#4CAF50;" d="M 18 17 C 18 19.761719 15.761719 22 13 22 C 10.238281 22 8 19.761719 8 17 C 8 14.238281 10.238281 12 13 12 C 15.761719 12 18 14.238281 18 17 Z "/>
-<path style=" fill:#4CAF50;" d="M 38 20 C 38 22.210938 36.210938 24 34 24 C 31.789063 24 30 22.210938 30 20 C 30 17.789063 31.789063 16 34 16 C 36.210938 16 38 17.789063 38 20 Z "/>
-<path style=" fill:#9CCC65;" d="M 31 19.5 C 31 21.433594 29.433594 23 27.5 23 C 25.566406 23 24 21.433594 24 19.5 C 24 17.566406 25.566406 16 27.5 16 C 29.433594 16 31 17.566406 31 19.5 Z "/>
-<path style=" fill:#9CCC65;" d="M 18 18.5 C 18 19.878906 16.878906 21 15.5 21 C 14.121094 21 13 19.878906 13 18.5 C 13 17.121094 14.121094 16 15.5 16 C 16.878906 16 18 17.121094 18 18.5 Z "/>
-<path style=" fill:#795548;" d="M 5 20 L 43 20 L 43 42 L 5 42 Z "/>
-<path style=" fill:#4E342E;" d="M 5 26 L 43 26 L 43 28 L 5 28 Z "/>
-<path style=" fill:#4E342E;" d="M 5 34 L 43 34 L 43 36 L 5 36 Z "/>
-<path style=" fill:#8D6E63;" d="M 9 20 L 13 20 L 13 42 L 9 42 Z "/>
-<path style=" fill:#8D6E63;" d="M 35 20 L 39 20 L 39 42 L 35 42 Z "/>
-<path style=" fill:#6D4C41;" d="M 7 20 L 9 20 L 9 42 L 7 42 Z "/>
-<path style=" fill:#6D4C41;" d="M 33 20 L 35 20 L 35 42 L 33 42 Z "/>
-<path style=" fill:#3E2723;" d="M 7 26 L 9 26 L 9 28 L 7 28 Z "/>
-<path style=" fill:#3E2723;" d="M 7 34 L 9 34 L 9 36 L 7 36 Z "/>
-<path style=" fill:#3E2723;" d="M 33 26 L 35 26 L 35 28 L 33 28 Z "/>
-<path style=" fill:#3E2723;" d="M 33 34 L 35 34 L 35 36 L 33 36 Z "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/gardener.svg b/app/assets/images/icons/gardener.svg
new file mode 100644
index 000000000..3f47a2fcd
--- /dev/null
+++ b/app/assets/images/icons/gardener.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144" height="144"><path fill="#3e2723" d="M32 34L16 34 15 18 33 18z"/><path fill="#3f51b5" d="M29,33L29,33l-5,1l-5-1c0,0-11,1.986-11,13h32C40,35.025,29,33,29,33"/><path fill="#ff9800" d="M24 39L19 33 19 27 29 27 29 33z"/><path fill="#4caf50" d="M30,33.254V42H18v-8.748c-0.945,0.28-2.445,0.823-4,1.791V42v2v2h20v-2v-2v-6.941C32.444,34.086,30.944,33.536,30,33.254z"/><path fill="#1b5e20" d="M15,44c0-0.553,0.447-1,1-1c0.552,0,1,0.447,1,1s-0.448,1-1,1C15.447,45,15,44.553,15,44z M32,45c0.552,0,1-0.447,1-1s-0.448-1-1-1c-0.553,0-1,0.447-1,1S31.447,45,32,45z"/><path fill="#ce8b05" d="M24 13A17 5.5 0 1 0 24 24A17 5.5 0 1 0 24 13Z"/><path fill="#fbc02d" d="M28,3c-2,0-2,2-4,2s-2-2-4-2s-6,6.029-6,11v0.059C16.808,13.396,20.257,13,24,13c3.742,0,7.191,0.396,10,1.059V14C34,9.029,30,3,28,3z"/><path fill="#ffb74d" d="M24,15c-4.716,0-7.609,0.906-9,1.499V23c0,4.971,4.028,9,9,9c4.971,0,9-4.029,9-9v-6.501C31.609,15.906,28.716,15,24,15z"/><path fill="#795548" d="M24 15c-7 0-10 2-10 2l0 0-3.747 4.731C9.981 24.408 10 26.766 10 28l6 6V21l10.051-5.935C25.407 15.026 24.73 15 24 15zM37.747 21.731L34 17c0 0-1.551-1.024-4.998-1.606L32 19v15l6-6C38 26.766 38.019 24.408 37.747 21.731z"/><path fill="#ed9f21" d="M14.422,11C14.158,12.004,14,13.023,14,14c0,0,4-1,10-1s10,1,10,1c0-0.977-0.159-1.996-0.423-3c0,0-5.577-1-9.577-1S14.422,11,14.422,11z"/><path fill="#784719" d="M27,23c0-0.551,0.448-1,1-1s1,0.449,1,1s-0.448,1-1,1S27,23.551,27,23 M19,23c0,0.551,0.448,1,1,1s1-0.449,1-1s-0.448-1-1-1S19,22.449,19,23"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/gardens.svg b/app/assets/images/icons/gardens.svg
new file mode 100644
index 000000000..fa71ba208
--- /dev/null
+++ b/app/assets/images/icons/gardens.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#9fa8da" d="M44,29H30V18.029l7-4.546l7,4.546V29z"/><path fill="#0d47a1" d="M39,24h-4v-4h4V24z"/><path fill="#b71c1c" d="M45 17.56L45 21 37 14.44 29 21 29 17.56 37 11z"/><path fill="#9fa8da" d="M18,29H4V18.029l7-4.546l7,4.546V29z"/><path fill="#0d47a1" d="M13,20H9v4h4V20z"/><path fill="#b71c1c" d="M19 17.56L19 21 11 14.44 3 21 3 17.56 11 11z"/><path fill="#e8eaf6" d="M33,31H15V15.571l9-6l9,6V31z"/><path fill="#1565c0" d="M27,18h-6v6h6V18z"/><path fill="#9fa8da" d="M33 18H34V20H33zM14 18H15V20H14z"/><path fill="#d32f2f" d="M34 14.2L34 19 24 10.8 14 19 14 14.2 24 6z"/><path fill="#8bc34a" d="M34.5,27C22.793,27,11.754,27.535,2,28.477V43h44V27.176C42.255,27.062,38.416,27,34.5,27z"/><path fill="#689f38" d="M18.688 27.338C11.93 28.534 6.153 30.466 2 32.891v6.101c6.106-5.784 13.729-9.952 22.202-11.846C22.34 27.197 20.501 27.26 18.688 27.338zM39.379 43c1.637-8.041 3.51-13.562 5.523-15.849-.35-.01-.706-.016-1.057-.024-3.131 2.26-6.019 7.818-8.489 15.873H39.379zM26.579 43c4.07-8.157 8.84-13.753 14.012-15.948-.455-.007-.917-.009-1.374-.015C32.511 29.231 26.39 34.864 21.325 43H26.579zM12.608 43c6.085-8.142 13.693-13.821 22.115-15.998C34.648 27.002 34.575 27 34.5 27c-.556 0-1.103.007-1.656.009C22.392 29.2 13.026 34.899 5.728 43H12.608z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/grass.svg b/app/assets/images/icons/grass.svg
new file mode 100644
index 000000000..9d77d945d
--- /dev/null
+++ b/app/assets/images/icons/grass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#388E3C" d="M20,42.986C20,26.007,27.264,11.928,29,9c-0.852,2.774-3,8-3,34.014L20,42.986z"/><path fill="#388E3C" d="M24,42.975C24,29.27,34.963,13.556,38,11c-1.684,2.342-8,12.291-8,32.025L24,42.975z"/><path fill="#388E3C" d="M19,43c0-17-5.631-25.871-7-28c1.765,1.823,13,16.016,13,28H19z"/><g><path fill="#8BC34A" d="M29 43c0-13.638 11.218-24.641 13-26-1.431 1.717-7 11-7 26H29zM14 43c0-15.034-6.457-24.327-8-26 1.877 1.3 14 12.746 14 26H14z"/></g><g><path fill="#4CAF50" d="M19.428 22.989c.372 1.44.668 2.895.917 4.356 2.538 4.838 4.652 10.449 4.655 15.647l2-.017c-.25-3.555-.745-7.176-1.516-10.682-.777-3.517-1.833-6.964-3.214-10.265-1.376-3.3-3.074-6.455-5.105-9.354C15.124 9.794 12.796 7.09 10 5c2.458 2.462 4.324 5.409 5.879 8.447C17.42 16.501 18.587 19.713 19.428 22.989zM21.001 43c0 .008-.001.017-.001.024L24 43H21.001z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/harvest-add.svg b/app/assets/images/icons/harvest-add.svg
new file mode 100644
index 000000000..f40bc92bc
--- /dev/null
+++ b/app/assets/images/icons/harvest-add.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1">
+<g id="surface1027379">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97.647059%,65.882353%,14.509804%);fill-opacity:1;" d="M 21.292969 15.804688 C 21.242188 16.882812 21.152344 22.007812 21 23 L 25 23 C 25 20 24.566406 16.632812 24.273438 15.476562 C 23.980469 14.335938 23.644531 13.210938 23.246094 12.109375 C 22.453125 9.917969 21.4375 7.769531 20 6 C 20.855469 8.105469 21.167969 10.320312 21.289062 12.511719 C 21.34375 13.609375 21.339844 14.710938 21.292969 15.804688 Z M 19 23 C 19 13.820312 13.316406 10.726562 12.261719 10.203125 C 11.203125 9.6875 10.113281 9.269531 9 9 C 10.953125 10.171875 15 12.835938 15 23 Z M 38 7 C 35.894531 8.191406 33.945312 9.757812 32.296875 11.707031 C 31.476562 12.6875 29 16.75 29 23 L 33 23 C 33 11.707031 36.304688 8.714844 38 7 Z M 29.105469 28 C 29.796875 35.339844 33.992188 41.3125 34.1875 41.582031 L 35.8125 40.421875 C 35.769531 40.359375 32.652344 34.726562 32.09375 28 Z M 15.90625 28 C 15.347656 34.726562 12.230469 40.359375 12.1875 40.421875 L 13.8125 41.582031 C 14.007812 41.3125 18.203125 35.339844 18.894531 28 Z M 24.0625 28 C 24.46875 35.550781 26.941406 43.820312 27.019531 44.195312 L 28.980469 43.804688 C 28.964844 43.714844 27.316406 35.398438 27.039062 28 Z M 20.960938 28 C 20.683594 35.394531 19.039062 43.714844 19.019531 43.804688 L 20.980469 44.199219 C 21.058594 43.820312 23.53125 35.550781 23.9375 28 Z M 34 26 C 34 25.445312 33.554688 25 33 25 L 15 25 C 14.445312 25 14 25.445312 14 26 C 14 26.554688 14.445312 27 15 27 L 33 27 C 33.554688 27 34 26.554688 34 26 Z M 34 26 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(84.705882%,54.117647%,9.803922%);fill-opacity:1;" d="M 18.925781 28 C 18.414062 35.816406 15.140625 42.480469 15.105469 42.554688 L 16.894531 43.449219 C 17.050781 43.136719 21.289062 36.265625 21.914062 28 Z M 16.558594 8.621094 C 17.183594 9.65625 17.601562 10.785156 17.863281 11.9375 C 18.128906 13.09375 18.242188 14.273438 18.253906 15.457031 C 18.253906 15.851562 18.246094 16.675781 18.230469 17.644531 C 18.695312 19.144531 19 20.90625 19 23 L 21 23 C 21.152344 22.007812 21.242188 16.882812 21.292969 15.804688 C 21.300781 15.660156 21.296875 15.515625 21.304688 15.371094 C 21.273438 15.234375 21.246094 15.109375 21.21875 15.011719 C 20.851562 13.703125 20.371094 12.421875 19.730469 11.222656 C 19.09375 10.027344 18.296875 8.910156 17.332031 7.992188 C 16.367188 7.078125 15.238281 6.324219 14 6 C 15.101562 6.632812 15.925781 7.597656 16.558594 8.621094 Z M 25 23 L 29.5 23 L 29 23 C 29 21.511719 29.144531 20.152344 29.367188 18.925781 C 29.363281 17.339844 29.398438 15.78125 29.472656 15.144531 C 29.617188 13.835938 29.921875 12.523438 30.363281 11.234375 C 30.804688 9.945312 31.386719 8.679688 32.074219 7.464844 C 32.769531 6.253906 33.5625 5.074219 34.5 4 C 33.335938 4.828125 32.265625 5.8125 31.269531 6.871094 C 30.277344 7.9375 29.363281 9.101562 28.566406 10.359375 C 27.765625 11.621094 27.082031 12.980469 26.558594 14.429688 C 26.265625 15.226562 25.972656 17.144531 25.769531 19.042969 C 25.707031 17.40625 25.652344 15.777344 25.617188 15.136719 C 25.546875 13.855469 25.539062 12.570312 25.632812 11.289062 C 25.726562 10.011719 25.914062 8.738281 26.28125 7.5 C 26.644531 6.265625 27.183594 5.058594 28 4 C 26.941406 4.820312 26.070312 5.910156 25.363281 7.097656 C 24.65625 8.285156 24.113281 9.574219 23.671875 10.890625 C 23.542969 11.269531 23.417969 11.738281 23.296875 12.257812 C 23.671875 13.3125 23.996094 14.386719 24.273438 15.476562 C 24.566406 16.632812 25 20 25 23 Z M 14.8125 28 C 13.855469 33.394531 9.410156 37.191406 9.359375 37.234375 L 10.640625 38.769531 C 10.875 38.574219 15.898438 34.296875 16.835938 28 Z M 33.1875 28 L 31.164062 28 C 32.101562 34.300781 37.125 38.574219 37.359375 38.769531 L 38.640625 37.234375 C 38.589844 37.191406 34.144531 33.394531 33.1875 28 Z M 26.085938 28 C 26.710938 36.265625 30.949219 43.136719 31.105469 43.449219 L 32.894531 42.554688 C 32.859375 42.480469 29.585938 35.816406 29.074219 28 Z M 23 28 L 25 28 L 25 44 L 23 44 Z M 23 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(76.862745%,47.058824%,7.843137%);fill-opacity:1;" d="M 34 24 C 34 24.554688 33.554688 25 33 25 L 15 25 C 14.445312 25 14 24.554688 14 24 C 14 23.445312 14.445312 23 15 23 L 33 23 C 33.554688 23 34 23.445312 34 24 Z M 34 28 C 34 28.554688 33.554688 29 33 29 L 15 29 C 14.445312 29 14 28.554688 14 28 C 14 27.445312 14.445312 27 15 27 L 33 27 C 33.554688 27 34 27.445312 34 28 Z M 34 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(26.27451%,62.745098%,27.843137%);fill-opacity:1;" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36 "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/harvest.svg b/app/assets/images/icons/harvest.svg
index e941e9e92..8b536cc22 100644
--- a/app/assets/images/icons/harvest.svg
+++ b/app/assets/images/icons/harvest.svg
@@ -1,5 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" " d="M 7.304688 4 L 4.664063 11.042969 L 6.804688 11.042969 L 8.695313 6 L 23.308594 6 L 25.199219 11.042969 L 27.332031 11.042969 L 24.691406 4 Z M 2 12 L 2 18 L 3.257813 18 L 6.257813 28 L 25.746094 28 L 28.746094 18 L 30 18 L 30 12 Z M 4 14 L 28 14 L 28 16 L 27.253906 16 L 24.253906 26 L 7.742188 26 L 4.742188 16 L 4 16 Z M 11 17 L 11 24 L 13 24 L 13 17 Z M 15 17 L 15 24 L 17 24 L 17 17 Z M 19 17 L 19 24 L 21 24 L 21 17 Z "/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#F9A825" d="M21.293 15.803C21.242 16.881 21.154 22.008 21 23h4c0-2.999-.435-6.369-.725-7.523-.293-1.141-.632-2.265-1.028-3.366C22.452 9.918 21.439 7.77 20 6c.857 2.105 1.168 4.32 1.288 6.513C21.344 13.611 21.341 14.71 21.293 15.803zM19 23c0-9.18-5.682-12.275-6.737-12.797C11.204 9.686 10.114 9.271 9 9.001c1.952 1.171 6 3.833 6 13.999H19zM38 7c-2.107 1.193-4.054 2.756-5.703 4.706C31.478 12.687 29 16.751 29 22.999h4C33 11.706 36.305 8.713 38 7zM29.106 28c.69 7.338 4.886 13.311 5.08 13.582l1.628-1.162c-.045-.062-3.163-5.695-3.721-12.42H29.106zM15.907 28c-.558 6.725-3.677 12.358-3.721 12.42l1.628 1.162c.194-.271 4.39-6.244 5.081-13.582H15.907zM24.062 28c.406 7.549 2.881 15.819 2.958 16.197l1.961-.393C28.963 43.714 27.316 35.4 27.04 28H24.062zM20.96 28c-.276 7.396-1.922 15.714-1.94 15.805l1.961.393c.076-.378 2.551-8.648 2.958-16.197H20.96zM34 26c0-.553-.447-1-1-1H15c-.553 0-1 .447-1 1l0 0c0 .553.447 1 1 1h18C33.553 27 34 26.553 34 26L34 26z"/><g><path fill="#D88A19" d="M18.926 28c-.511 7.815-3.785 14.482-3.821 14.555l1.789.894c.156-.311 4.395-7.183 5.021-15.448H18.926zM16.557 8.622c.626 1.034 1.043 2.164 1.308 3.317.265 1.154.376 2.336.387 3.518.003.394-.005 1.218-.023 2.187C18.696 19.146 19 20.907 19 23h2c.154-.992.242-6.119.293-7.197.006-.143.005-.287.01-.43-.029-.137-.057-.262-.085-.362-.366-1.308-.848-2.59-1.486-3.788-.637-1.197-1.434-2.311-2.4-3.232C16.368 7.08 15.238 6.324 14 6 15.103 6.632 15.927 7.599 16.557 8.622zM25 23h.5H26h3.5c0 0 0 0 0-.001H29c0-1.486.143-2.845.368-4.072-.003-1.586.03-3.146.103-3.784.147-1.306.451-2.62.894-3.908.441-1.289 1.02-2.554 1.71-3.77C32.77 6.252 33.562 5.073 34.5 4c-1.166.829-2.233 1.811-3.23 2.871-.993 1.065-1.905 2.229-2.704 3.489s-1.483 2.622-2.009 4.071c-.292.794-.583 2.714-.786 4.611-.065-1.635-.118-3.264-.154-3.905-.072-1.282-.079-2.566.014-3.846.094-1.278.285-2.554.65-3.791C26.645 6.267 27.182 5.06 28 4c-1.057.822-1.931 1.912-2.635 3.098-.708 1.188-1.253 2.475-1.694 3.791-.128.38-.253.849-.375 1.369.374 1.055.699 2.129.979 3.219C24.565 16.631 25 20.001 25 23zM14.811 28c-.954 5.393-5.402 9.191-5.452 9.233l1.281 1.536c.235-.196 5.258-4.471 6.196-10.77H14.811zM33.189 28h-2.025c.938 6.299 5.961 10.573 6.195 10.77l1.282-1.536C38.591 37.191 34.143 33.393 33.189 28zM26.084 28c.627 8.266 4.866 15.138 5.021 15.448l1.789-.894c-.036-.072-3.31-6.739-3.821-14.555H26.084zM23 28H25V44H23z"/></g><g><path fill="#C47814" d="M34 24c0 .553-.447 1-1 1H15c-.553 0-1-.447-1-1l0 0c0-.553.447-1 1-1h18C33.553 23 34 23.447 34 24L34 24zM34 28c0 .553-.447 1-1 1H15c-.553 0-1-.447-1-1l0 0c0-.553.447-1 1-1h18C33.553 27 34 27.447 34 28L34 28z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/home.svg b/app/assets/images/icons/home.svg
deleted file mode 100644
index ae5dc8d22..000000000
--- a/app/assets/images/icons/home.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" " d="M 16 2.59375 L 15.28125 3.28125 L 2.28125 16.28125 L 3.71875 17.71875 L 5 16.4375 L 5 28 L 14 28 L 14 18 L 18 18 L 18 28 L 27 28 L 27 16.4375 L 28.28125 17.71875 L 29.71875 16.28125 L 16.71875 3.28125 Z M 16 5.4375 L 25 14.4375 L 25 26 L 20 26 L 20 16 L 12 16 L 12 26 L 7 26 L 7 14.4375 Z "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/hose.svg b/app/assets/images/icons/hose.svg
new file mode 100644
index 000000000..448d1cd78
--- /dev/null
+++ b/app/assets/images/icons/hose.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#2196F3" d="M37.891,11.663c0.919,0.613,2.16,0.364,2.773-0.555s0.364-2.161-0.555-2.773c-0.919-0.613-4.387-0.419-4.387-0.419S36.972,11.051,37.891,11.663z"/><path fill="#4CAF50" d="M37.5,21H10v3h27.5c0.827,0,1.5,0.673,1.5,1.5S38.327,27,37.5,27H10v3h27.5c2.481,0,4.5-2.019,4.5-4.5S39.981,21,37.5,21z"/><path fill="#4CAF50" d="M38,33H10.5C9.673,33,9,32.327,9,31.5S9.673,30,10.5,30H38v-3H10.5C8.019,27,6,29.019,6,31.5S8.019,36,10.5,36H38V33z"/><path fill="#4CAF50" d="M37.5 33H10v3h27.5c.827 0 1.5.673 1.5 1.5S38.327 39 37.5 39H6v3h31.5c2.481 0 4.5-2.019 4.5-4.5S39.981 33 37.5 33zM9 19.5c0-.176-3-.171-3 0 0 2.481 2.019 4.5 4.5 4.5H38v-3H10.5C9.673 21 9 20.327 9 19.5z"/><path fill="#4CAF50" d="M9,19.437H6c0-5.107,4.173-6.213,10.491-7.887c1.644-0.436,9.91-2.885,11.98-3.506l0.863,2.873c-2.118,0.636-10.409,3.092-12.075,3.533C10.459,16.252,9,16.879,9,19.437z"/><path fill="#37474F" d="M33.423 9.619L26.992 12.563 25.577 7.766 32.573 6.744z"/><path fill="#2E7D32" d="M27.275,13.521c0.156,0.528-0.146,1.085-0.675,1.242l-0.96,0.282c-0.529,0.158-1.086-0.146-1.242-0.676l-1.982-6.712c-0.156-0.531,0.146-1.088,0.676-1.243l0.959-0.284c0.529-0.155,1.085,0.148,1.242,0.676L27.275,13.521z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/insect.svg b/app/assets/images/icons/insect.svg
new file mode 100644
index 000000000..635b3259b
--- /dev/null
+++ b/app/assets/images/icons/insect.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#37474f" d="M29 19c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l5.4-2.7V8.5l4.4-3.3c.4-.3 1.1-.2 1.4.2.3.4.2 1.1-.2 1.4L36 9.5v6.1l-6.6 3.3C29.3 19 29.2 19 29 19zM19 19c-.1 0-.3 0-.4-.1L12 15.6V9.5L8.4 6.8C8 6.5 7.9 5.8 8.2 5.4c.3-.4 1-.5 1.4-.2L14 8.5v5.9l5.4 2.7c.5.2.7.8.4 1.3C19.7 18.8 19.4 19 19 19zM38 42c-.2 0-.3 0-.4-.1l-6.5-3.2-1-7.9-2.4-.8c-.5-.2-.8-.7-.6-1.3.2-.5.7-.8 1.3-.6l3.6 1.2 1 8.1 5.5 2.8c.5.2.7.8.4 1.3C38.7 41.8 38.4 42 38 42zM41 35c-.2 0-.3 0-.4-.1l-4.5-2.2-1-8.9-5.4-1.8c-.5-.2-.8-.7-.6-1.3.2-.5.7-.8 1.3-.6l6.6 2.2 1 9.1 3.5 1.8c.5.2.7.8.4 1.3C41.7 34.8 41.4 35 41 35zM10 42c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l5.5-2.8 1-8.1 3.6-1.2c.5-.2 1.1.1 1.3.6.2.5-.1 1.1-.6 1.3l-2.4.8-1 7.9-6.5 3.2C10.3 42 10.2 42 10 42zM7 35c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l3.5-1.8 1-9.1 6.6-2.2c.5-.2 1.1.1 1.3.6.2.5-.1 1.1-.6 1.3l-5.4 1.8-1 8.9-4.5 2.2C7.3 35 7.2 35 7 35zM28 16c0 1.1-.9 2-2 2h-4c-1.1 0-2-.9-2-2v-3c0-1.1.9-2 2-2h4c1.1 0 2 .9 2 2V16z"/><path fill="#37474f" d="M25,12h-2V8.3l0.7-0.2C23.8,8,26,7.2,26,5h2c0,2.7-1.9,4.1-3,4.6V12z"/><path fill="#37474f" d="M23.7,9.9C23.5,9.9,20,8.7,20,5h2c0,2.2,2.2,3,2.3,3.1L23.7,9.9z"/><path fill="#8bc34a" d="M15.9,34c0,0,1,8,8.1,8c7.1,0,8.1-8,8.1-8l0.8-8c0,0,0.2-2-1.9-2c-2,0-12.2,0-14.3,0 c-2,0-1.9,2-1.9,2L15.9,34z"/><path fill="#2e7d32" d="M25,24c-0.7,0-1.3,0-2,0v17.9c0.3,0,0.6,0.1,1,0.1s0.7,0,1-0.1V24z"/><path fill="#43a047" d="M29 40.1V24c-.6 0-1.3 0-2 0v17.4C27.8 41.1 28.5 40.6 29 40.1zM32.2 34l.8-8c0 0 .3-2-2-2v13.6C31.9 35.9 32.2 34 32.2 34zM21 41.4V24c-.7 0-1.4 0-2 0v16.1C19.6 40.6 20.2 41.1 21 41.4zM15 26l.8 8c0 0 .3 1.9 1.1 3.5V24C14.8 24 15 26 15 26z"/><path fill="#2e7d32" d="M25,14H23c-5.9,0-8,3.8-8,8c0,1.9,2.2,2,2.2,2h13.6c0,0,2.2,0,2.2-1.9C33,17.8,30.9,14,25,14z"/><path fill="#09350b" d="M21,24c0,0,1-2,3-2s3,2,3,2c-2,0-3,6-3,6S23,24,21,24z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/ladybird.svg b/app/assets/images/icons/ladybird.svg
new file mode 100644
index 000000000..a580ccae1
--- /dev/null
+++ b/app/assets/images/icons/ladybird.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#5d4037" d="M27,13c0,1.7-1.3,3-3,3s-3-1.3-3-3l-2-2c0-1.7,3.3-4,5-4s5,2.3,5,4L27,13z"/><path fill="#5d4037" d="M17 15l5 2h4l5-2c0-3-2-4-2-4H19C19 11 17 12 17 15zM41 29c-.1 0-.2 0-.3-.1l-6.6-2.2L33 20.2c-.1-.5.3-1.1.8-1.2.5-.1 1.1.3 1.2.8l.9 5.4 5.4 1.8c.5.2.8.7.6 1.3C41.8 28.7 41.4 29 41 29zM41 42c-.2 0-.3 0-.4-.1l-4.4-2.2-2.1-6.4c-.2-.5.1-1.1.6-1.3.5-.2 1.1.1 1.3.6l1.9 5.6 3.6 1.8c.5.2.7.8.4 1.3C41.7 41.8 41.4 42 41 42zM7 29c-.4 0-.8-.3-.9-.7-.2-.5.1-1.1.6-1.3l5.4-1.8.9-5.4c.1-.5.6-.9 1.2-.8.5.1.9.6.8 1.2l-1.1 6.6L7.3 29C7.2 29 7.1 29 7 29zM7 42c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l3.6-1.8 1.9-5.6c.2-.5.7-.8 1.3-.6.5.2.8.7.6 1.3l-2.1 6.4-4.4 2.2C7.3 42 7.2 42 7 42z"/><path fill="#5d4037" d="M37.6,19H24c-0.6,0-1-0.4-1-1s0.4-1,1-1h12.4l2.7-4.5c0.3-0.5,0.9-0.6,1.4-0.3 c0.5,0.3,0.6,0.9,0.3,1.4L37.6,19z"/><path fill="#5d4037" d="M24 19H10.4l-3.3-5.5C6.9 13 7 12.4 7.5 12.1 8 11.9 8.6 12 8.9 12.5l2.7 4.5H24c.6 0 1 .4 1 1S24.6 19 24 19zM23 10c-.3 0-.5-.1-.7-.3C22.2 9.6 20.5 8 17 8c-.6 0-1-.4-1-1s.4-1 1-1c4.4 0 6.6 2.2 6.7 2.3.4.4.4 1 0 1.4C23.5 9.9 23.3 10 23 10z"/><path fill="#5d4037" d="M25,10c-0.3,0-0.5-0.1-0.7-0.3c-0.4-0.4-0.4-1,0-1.4C24.4,8.2,26.6,6,31,6c0.6,0,1,0.4,1,1 s-0.4,1-1,1c-3.5,0-5.2,1.6-5.3,1.7C25.5,9.9,25.3,10,25,10z"/><path fill="#b71c1c" d="M23,20h2v22h-2V20z"/><path fill="#ff3d00" d="M15.2,17c-2.4,2.4-4.2,5.8-4.2,10c0,8.8,7.7,15,12,15l1-23l1,23c4.3,0,12-6.2,12-15 c0-4.2-1.8-7.6-4.2-10H15.2z"/><path fill="#3e2723" d="M24 22c2.8 0 5-2.2 5-5H19C19 19.8 21.2 22 24 22zM32 28.5c0 1.4-1.1 2.5-2.5 2.5S27 29.9 27 28.5s1.1-2.5 2.5-2.5S32 27.1 32 28.5zM21 28.5c0 1.4-1.1 2.5-2.5 2.5S16 29.9 16 28.5s1.1-2.5 2.5-2.5S21 27.1 21 28.5zM13.3 22.4c-.5 1-.4 2.1.4 2.5.7.4 1.7-.1 2.3-1.1.5-1 .4-2.1-.4-2.5C14.8 20.9 13.8 21.4 13.3 22.4zM34.9 22.4c-.5-1-1.5-1.4-2.3-1.1s-.9 1.5-.4 2.5c.5 1 1.5 1.4 2.3 1.1C35.3 24.5 35.5 23.4 34.9 22.4zM29.4 37.6c.6.6 1.7.4 2.5-.4s.9-1.9.4-2.5-1.7-.4-2.5.4S28.8 37.1 29.4 37.6zM19.2 37.6c.6-.6.4-1.7-.4-2.5s-1.9-.9-2.5-.4-.4 1.7.4 2.5S18.6 38.2 19.2 37.6z"/><path fill="#a1887f" d="M29 11h-2v2c0 .6.4 1 1 1h2.9C30.5 11.8 29 11 29 11zM19 11h2v2c0 .6-.4 1-1 1h-2.9C17.5 11.8 19 11 19 11z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/notification.svg b/app/assets/images/icons/notification.svg
new file mode 100644
index 000000000..462ba7e9b
--- /dev/null
+++ b/app/assets/images/icons/notification.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#DB8509" d="M24 34.001A4 4 0 1 0 24 42.001 4 4 0 1 0 24 34.001zM26 11c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2V7c0-1.104.896-2 2-2l0 0c1.104 0 2 .896 2 2V11z"/><path fill="#BC6F0A" d="M27.887,38.91C27.955,38.617,28,38.314,28,38.001c0-0.383-0.07-0.746-0.172-1.097C26.609,36.965,25.333,37,24,37s-2.609-0.035-3.829-0.096C20.071,37.255,20,37.618,20,38.001c0,0.313,0.045,0.616,0.113,0.909C21.584,38.979,22.926,39,24,39S26.416,38.979,27.887,38.91z"/><path fill="#FFC107" d="M33,33V16.801c0-4.97-4.029-9-9-9s-9,4.03-9,9V33H33z"/><path fill="#FFC107" d="M41,33c0,2.209-7.059,4-17,4S7,35.209,7,33s7.059-4,17-4S41,30.791,41,33z"/><path fill="#FFC107" d="M7,33c0-1.999,8-9.001,8-12s18-3.001,18,0s8,9.999,8,12S7,34.999,7,33z"/><path fill="#FFE082" d="M9.275,29.424c-0.491,0.593-0.929,1.146-1.295,1.65c1.622,0.655,8.15,3.062,16.562,3.062c4.746,0,10.089-0.78,15.476-3.064c-0.362-0.499-0.796-1.046-1.281-1.632C25.699,34.724,12.698,30.68,9.275,29.424z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/photo.svg b/app/assets/images/icons/photo.svg
new file mode 100644
index 000000000..f002aa3f4
--- /dev/null
+++ b/app/assets/images/icons/photo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 48 48" width="48" height="48"><path fill="#64B5F6" d="M12.3 12.3H40.3V40.3H12.3z" transform="rotate(18.558 26.274 26.27)"/><path fill="#1E88E5" d="M15.6 15.4H37.6V35.4H15.6z" transform="rotate(18.042 26.563 25.412)"/><path fill="#90CAF9" d="M8.1 8.1H36.1V36.1H8.1z" transform="rotate(10.454 22.134 22.135)"/><path fill="#42A5F5" d="M11.3 11.2H33.3V31.2H11.3z" transform="rotate(10.068 22.284 21.207)"/><path fill="#BBDEFB" d="M4 4H32V32H4z"/><path fill="#4CAF50" d="M7 7H29V27H7z"/><path fill="#FFF" d="M16 13c0-1.1.9-2 2-2s2 .9 2 2-2 4-2 4S16 14.1 16 13zM20 21c0 1.1-.9 2-2 2s-2-.9-2-2 2-4 2-4S20 19.9 20 21z"/><path fill="#FFF" d="M13.5 16.7c-1-.6-1.3-1.8-.7-2.7.6-1 1.8-1.3 2.7-.7 1 .6 2.5 3.7 2.5 3.7S14.5 17.3 13.5 16.7zM22.5 17.3c1 .6 1.3 1.8.7 2.7-.6 1-1.8 1.3-2.7.7C19.5 20.2 18 17 18 17S21.5 16.7 22.5 17.3z"/><path fill="#FFF" d="M22.5 16.7c1-.6 1.3-1.8.7-2.7-.6-1-1.8-1.3-2.7-.7C19.5 13.8 18 17 18 17S21.5 17.3 22.5 16.7zM13.5 17.3c-1 .6-1.3 1.8-.7 2.7.6 1 1.8 1.3 2.7.7 1-.6 2.5-3.7 2.5-3.7S14.5 16.7 13.5 17.3z"/><path fill="#FFC107" d="M18 15A2 2 0 1 0 18 19A2 2 0 1 0 18 15Z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant-seeds.svg b/app/assets/images/icons/plant-seeds.svg
deleted file mode 100644
index 86fc2a6c7..000000000
--- a/app/assets/images/icons/plant-seeds.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="100" height="100" fill="000000">
-    <path d="M 12.457031 4 C 12.303766 4.0054531 12.180109 4.0547969 12.099609 4.1542969 C 11.777609 4.5522969 12.255016 5.5897031 13.166016 6.4707031 C 14.077016 7.3517031 15.076437 7.7427031 15.398438 7.3457031 C 15.720438 6.9477031 15.243031 5.9102969 14.332031 5.0292969 C 13.648781 4.3685469 12.916828 3.9836406 12.457031 4 z M 18.273438 7.0078125 C 17.745498 7.0965566 17.100062 7.9065781 16.742188 8.9863281 C 16.333187 10.220328 16.453766 11.339375 17.009766 11.484375 C 17.565766 11.629375 18.348813 10.745719 18.757812 9.5117188 C 19.166812 8.2777187 19.046234 7.160625 18.490234 7.015625 C 18.420734 6.9975 18.348857 6.9951348 18.273438 7.0078125 z M 10.966797 9.0019531 C 10.493797 8.9824531 10.145656 9.0859531 10.035156 9.3144531 C 9.8141562 9.7714531 10.626609 10.561125 11.849609 11.078125 C 13.072609 11.595125 14.243844 11.643547 14.464844 11.185547 C 14.685844 10.728547 13.873391 9.938875 12.650391 9.421875 C 12.038891 9.163375 11.439797 9.0214531 10.966797 9.0019531 z M 3 14 L 3 16 L 9.203125 16 C 9.709475 19.363146 12.49988 22 16 22 C 19.50012 22 22.290525 19.363146 22.796875 16 L 29 16 L 29 14 L 21 14 L 21 15 C 21 17.773666 18.773666 20 16 20 C 13.226334 20 11 17.773666 11 15 L 11 14 L 3 14 z M 15.830078 14.001953 A 2.5 0.99900001 0.361 0 0 13.5 14.984375 A 2.5 0.99900001 0.361 0 0 15.994141 15.998047 A 2.5 0.99900001 0.361 0 0 18.5 15.015625 A 2.5 0.99900001 0.361 0 0 16.005859 14.001953 A 2.5 0.99900001 0.361 0 0 15.830078 14.001953 z M 7 17 A 1 1 0 0 0 6 18 A 1 1 0 0 0 7 19 A 1 1 0 0 0 8 18 A 1 1 0 0 0 7 17 z M 25 17 A 1 1 0 0 0 24 18 A 1 1 0 0 0 25 19 A 1 1 0 0 0 26 18 A 1 1 0 0 0 25 17 z M 4 20 A 1 1 0 0 0 3 21 A 1 1 0 0 0 4 22 A 1 1 0 0 0 5 21 A 1 1 0 0 0 4 20 z M 10 20 A 1 1 0 0 0 9 21 A 1 1 0 0 0 10 22 A 1 1 0 0 0 11 21 A 1 1 0 0 0 10 20 z M 22 20 A 1 1 0 0 0 21 21 A 1 1 0 0 0 22 22 A 1 1 0 0 0 23 21 A 1 1 0 0 0 22 20 z M 28 20 A 1 1 0 0 0 27 21 A 1 1 0 0 0 28 22 A 1 1 0 0 0 29 21 A 1 1 0 0 0 28 20 z M 7 23 A 1 1 0 0 0 6 24 A 1 1 0 0 0 7 25 A 1 1 0 0 0 8 24 A 1 1 0 0 0 7 23 z M 13 23 A 1 1 0 0 0 12 24 A 1 1 0 0 0 13 25 A 1 1 0 0 0 14 24 A 1 1 0 0 0 13 23 z M 19 23 A 1 1 0 0 0 18 24 A 1 1 0 0 0 19 25 A 1 1 0 0 0 20 24 A 1 1 0 0 0 19 23 z M 25 23 A 1 1 0 0 0 24 24 A 1 1 0 0 0 25 25 A 1 1 0 0 0 26 24 A 1 1 0 0 0 25 23 z M 4 26 A 1 1 0 0 0 3 27 A 1 1 0 0 0 4 28 A 1 1 0 0 0 5 27 A 1 1 0 0 0 4 26 z M 10 26 A 1 1 0 0 0 9 27 A 1 1 0 0 0 10 28 A 1 1 0 0 0 11 27 A 1 1 0 0 0 10 26 z M 16 26 A 1 1 0 0 0 15 27 A 1 1 0 0 0 16 28 A 1 1 0 0 0 17 27 A 1 1 0 0 0 16 26 z M 22 26 A 1 1 0 0 0 21 27 A 1 1 0 0 0 22 28 A 1 1 0 0 0 23 27 A 1 1 0 0 0 22 26 z M 28 26 A 1 1 0 0 0 27 27 A 1 1 0 0 0 28 28 A 1 1 0 0 0 29 27 A 1 1 0 0 0 28 26 z"/>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/bark.svg b/app/assets/images/icons/plant_parts/bark.svg
new file mode 100644
index 000000000..f1f1af1ed
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/bark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#cfd8dc" d="M20 5H24V43H20z"/><path fill="#b0bec5" d="M24 5H28V43H24z" transform="rotate(-180 26 24)"/><path fill="#455a64" d="M28 11L25 11 25 10 26 9 28 9zM20 16L23 16 23 15 22 14 20 14zM28 22L25 22 25 21 26 20 28 20zM20 27L23 27 23 26 22 25 20 25zM28 34L25 34 25 33 26 32 28 32zM20 39L23 39 23 38 22 37 20 37z"/><path fill="#cfd8dc" d="M38 5L32 5 35 43 41 43z"/><path fill="#b0bec5" d="M38 5L35 5 38 43 41 43z"/><path fill="#455a64" d="M38 34L40.175 34 40.025 32 39 32 38 33zM37 9L36 10 36 11 38.45 11 38.3 9zM37 39L37 38 36 37 34.4 37 34.55 39zM38 20L37 21 37 22 39.275 22 39.125 20zM36 27L36 26 35 25 33.5 25 33.65 27zM32.825 16L35 16 35 15 34 14 32.675 14z"/><path fill="#cfd8dc" d="M13,5H7c0,0,3,13.047,3,38h6C16,18.047,13,5,13,5z"/><path fill="#b0bec5" d="M13,5h-3c0,0,3,13.047,3,38h3C16,18.047,13,5,13,5z"/><g><path fill="#455a64" d="M8.538 16H11v-1l-1-1H8.314C8.388 14.636 8.463 15.302 8.538 16zM12 27v-1l-1-1H9.327c.045.652.089 1.32.13 2H12zM11 10v1h2.939c-.098-.733-.192-1.397-.28-2H12L11 10zM13 20l-1 1v1h3.101c-.056-.684-.112-1.354-.17-2H13zM13 34h2.801c-.025-.677-.052-1.344-.08-2H14l-1 1V34zM13 38l-1-1H9.894c.017.658.033 1.324.046 2H13V38z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/bulb.svg b/app/assets/images/icons/plant_parts/bulb.svg
new file mode 100644
index 000000000..48b62c4ce
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/bulb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#f3e5f5" d="M29,3c0,9,9,10,8.5,21c-0.3,7.4-6,13.5-13.5,13.5S10.3,31.4,10,24c-0.5-11,9-12,9-21"/><path fill="#9c27b0" d="M24,39c-8.3,0-15-6.7-15-15c0-6.1,2.7-9.4,5.1-12.3C16.2,9.1,18,6.9,18,3h2c0,4.6-2.2,7.3-4.4,10 c-2.3,2.8-4.6,5.6-4.6,11c0,7.2,5.8,13,13,13c7.2,0,13-5.8,13-13c0-5.4-2.3-8.3-4.6-11C30.2,10.3,28,7.6,28,3h2 c0,3.9,1.8,6.1,3.9,8.7C36.3,14.6,39,17.9,39,24C39,32.3,32.3,39,24,39z"/><path fill="#e1bee7" d="M24,37c-6.1,0-11-4.9-11-11c0-4.3,1.5-6.7,3.1-9.2C18,13.7,20,10.5,20,3h2c0,8.1-2.2,11.7-4.2,14.8 C16.3,20.2,15,22.3,15,26c0,5,4,9,9,9c5,0,9-4,9-9c0-3.7-1.3-5.8-2.8-8.1C28.2,14.7,26,11.1,26,3h2c0,7.5,2,10.7,3.9,13.8 c1.6,2.5,3.1,4.9,3.1,9.2C35,32.1,30.1,37,24,37z"/><path fill="#e1bee7" d="M24,35c-3.9,0-7-3.1-7-7c0-1.3,0.5-2.9,1.3-5.1C19.7,18.6,21.9,12.2,22,3l2,0 c-0.1,9.5-2.3,16.1-3.8,20.5c-0.7,2-1.2,3.5-1.2,4.5c0,2.8,2.2,5,5,5s5-2.2,5-5c0-1.7-0.7-3.6-1.5-6.1C26,17.7,24,11.9,24,3h2 c0,8.6,1.9,14.2,3.4,18.3C30.3,23.9,31,26,31,28C31,31.9,27.9,35,24,35z"/><path fill="#e1bee7" d="M21,30c0-1.7,3-13,3-13s3,11.3,3,13s-1.3,3-3,3S21,31.7,21,30z"/><path fill="#ab47bc" d="M22,31c0-1.1,2-7,2-7s2,5.9,2,7s-0.9,2-2,2S22,32.1,22,31z"/><path fill="#5d4037" d="M26.9,36.7C26,36.9,25,37,24,37s-2-0.1-2.9-0.3L19,42l2.7-3.2L21,44l2.2-5.1L24,45l0.8-6.1L27,44 l-0.7-5.2L29,42L26.9,36.7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/flower.svg b/app/assets/images/icons/plant_parts/flower.svg
new file mode 100644
index 000000000..2aed72c48
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/flower.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 48 48"><g data-name="Flower Doodle"><path fill="#ff738d" d="M12.515,10.805a81.876,81.876,0,0,1,8.275,6.9c-.01,0-1.26.642-1.26.642-1.667,1.085-1.547,1.525-2.187,3.5s-1,2.265-.285,4.113l.642,1.26a77.654,77.654,0,0,1-9.487.072c-1.952-.218-3.575-.382-4.755-1.545A4.334,4.334,0,0,1,3.1,20.364c1.707-2.415,3.658-5.423,3.423-7.3-.216-1.677.3-3.275,2.187-3.495A6.45,6.45,0,0,1,12.515,10.805Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.4,23.787a25.847,25.847,0,0,0,6.325-.048"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12.872,16.179s4.161,2.3,5.089,3.756"/><circle cx="7.238" cy="23.811" r="1" fill="#ff3d63"/><circle cx="10.685" cy="19.674" r="1" fill="#ff3d63"/><circle cx="10.328" cy="14.3" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M9.309,9.574A2.044,2.044,0,0,0,8,12a10.492,10.492,0,0,1-2,7c-.92,1.31-2.593,4.431-1,6,1.179,1.161,5.05.787,7,1a35.11,35.11,0,0,0,5.122.076L17.7,27.21a78.969,78.969,0,0,1-9.487.072c-1.95-.213-3.576-.384-4.755-1.545A4.338,4.338,0,0,1,3.1,20.364c1.708-2.41,3.655-5.426,3.423-7.3-.212-1.677.3-3.278,2.187-3.495A2.4,2.4,0,0,1,9.309,9.574Z"/><path fill="#ff738d" d="M7.9,30.845a81.911,81.911,0,0,1,9.114-5.739c-.006.008.221,1.4.221,1.4.517,1.92.973,1.942,2.649,3.16s1.845,1.65,3.823,1.542l1.4-.221a77.62,77.62,0,0,1-2.863,9.045c-.811,1.789-1.468,3.281-2.939,4.045a4.334,4.334,0,0,1-5.22-1.321c-1.77-2.37-4.027-5.155-5.885-5.512-1.662-.312-3.022-1.3-2.648-3.16A6.449,6.449,0,0,1,7.9,30.845Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19.6,36.868A25.861,25.861,0,0,0,21.5,30.839"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.123,32.166s3.47-3.247,5.144-3.678"/><circle cx="18.641" cy="39.883" r="1" fill="#ff3d63"/><circle cx="15.771" cy="35.326" r="1" fill="#ff3d63"/><circle cx="10.55" cy="34.005" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M5.74,33.514C6,35,6.21,34.846,7,35c1.854.358,4.877,2.59,6.641,4.959C14.6,41.239,17.015,44.03,19,43c1.469-.762,2-3.977,2.8-5.765a55,55,0,0,0,2.048-6.052l1.257-.2a79.012,79.012,0,0,1-2.863,9.045c-.8,1.788-1.47,3.282-2.939,4.045a4.338,4.338,0,0,1-5.22-1.321c-1.765-2.37-4.031-5.154-5.885-5.512-1.661-.316-3.026-1.3-2.648-3.16A2.39,2.39,0,0,1,5.74,33.514Z"/><path fill="#ff738d" d="M25.536,41.425a81.63,81.63,0,0,1-2.642-10.441c.006.008,1.4.221,1.4.221,1.986.1,2.148-.324,3.823-1.542s2.139-1.245,2.649-3.16l.221-1.4A77.639,77.639,0,0,1,38.7,30.624c1.451,1.324,2.667,2.411,2.939,4.045a4.333,4.333,0,0,1-2.869,4.557c-2.8.95-6.147,2.237-7.06,3.893-.811,1.484-2.169,2.473-3.824,1.542A6.437,6.437,0,0,1,25.536,41.425Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M34.877,32.166a25.813,25.813,0,0,0-5.144-3.678"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M28.405,36.868s-2.016-4.3-1.909-6.029"/><circle cx="37.45" cy="34.005" r="1" fill="#ff3d63"/><circle cx="32.229" cy="35.326" r="1" fill="#ff3d63"/><circle cx="29.359" cy="39.883" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M27.406,44.306C29,45,29.609,43.7,30,43c.913-1.652,3.178-3.271,5.977-4.216,1.514-.52,4.39-1.578,4.023-3.784-.271-1.632-2.64-3.5-4.092-4.819a54.8,54.8,0,0,0-5.123-3.818l.2-1.257A79.011,79.011,0,0,1,38.7,30.624c1.452,1.318,2.668,2.413,2.939,4.045a4.337,4.337,0,0,1-2.869,4.557c-2.8.946-6.147,2.241-7.06,3.893C30.9,44.6,29.543,45.6,27.887,44.661A2.371,2.371,0,0,1,27.406,44.306Z"/><path fill="#ff738d" d="M41.047,27.924A81.758,81.758,0,0,1,30.3,27.21c.01,0,.642-1.26.642-1.26.711-1.857.356-2.143-.285-4.113s-.523-2.419-2.187-3.5L27.21,17.7a77.656,77.656,0,0,1,7.633-5.635c1.707-.971,3.117-1.792,4.755-1.545a4.334,4.334,0,0,1,3.447,4.137c.039,2.958.228,6.538,1.521,7.918,1.161,1.23,1.682,2.827.285,4.113A6.446,6.446,0,0,1,41.047,27.924Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M35.128,16.179a25.842,25.842,0,0,0-5.089,3.756"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M37.6,23.787s-4.717.587-6.325-.048"/><circle cx="37.672" cy="14.3" r="1" fill="#ff3d63"/><circle cx="37.315" cy="19.674" r="1" fill="#ff3d63"/><circle cx="40.762" cy="23.811" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M44.365,27.036A2.755,2.755,0,0,0,44,24a10.4,10.4,0,0,1-2.239-6.822c-.026-1.6-.55-4.845-2.761-5.178-1.636-.246-3.739,1.612-5.441,2.585a54.956,54.956,0,0,0-5.215,3.692L27.21,17.7a78.962,78.962,0,0,1,7.633-5.635c1.7-.973,3.119-1.791,4.755-1.545a4.338,4.338,0,0,1,3.447,4.137c.035,2.954.232,6.539,1.521,7.918,1.158,1.233,1.686,2.827.285,4.113A2.377,2.377,0,0,1,44.365,27.036Z"/><path fill="#ff738d" d="M33,9a81.81,81.81,0,0,1-4,10c0-.01-1-1-1-1-1.547-1.25-1.928-1-4-1s-2.462-.25-4,1l-1,1a77.619,77.619,0,0,1-3-9c-.4-1.924-.741-3.518,0-5a4.334,4.334,0,0,1,5-2c2.825.877,6.287,1.8,8,1,1.528-.724,3.208-.726,4,1A6.445,6.445,0,0,1,33,9Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20,11a25.824,25.824,0,0,0,2,6"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M28,11s-.9,4.667-2,6"/><circle cx="19" cy="8" r="1" fill="#ff3d63"/><circle cx="24" cy="10" r="1" fill="#ff3d63"/><circle cx="29" cy="8" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M33.18,5.57C32,4,30.73,4.66,30,5a9.908,9.908,0,0,1-7,0c-1.53-.47-5-1-6,1-.74,1.48.6,4.08,1,6a41.763,41.763,0,0,0,1.27,4.3c-.59-.53-1.22-1.09-1.88-1.65A40.941,40.941,0,0,1,16,10c-.4-1.92-.74-3.52,0-5a4.338,4.338,0,0,1,5-2c2.82.88,6.29,1.8,8,1,1.53-.72,3.21-.73,4,1A2.38,2.38,0,0,1,33.18,5.57Z"/><path fill="#ffec96" d="M32,24.008a8,8,0,1,1-12.968-6.28c.016-.008.024-.024.04-.032.048-.032.088-.064.128-.1h.008a7.976,7.976,0,0,1,9.584,0s0-.008.008,0h.008a.4.4,0,0,1,.064.056,1.247,1.247,0,0,1,.16.128A7.984,7.984,0,0,1,32,24.008Z"/><path fill="#ffdb45" d="M24.13,32H24a8,8,0,0,1-4.97-14.27c.02-.01.03-.03.04-.03.05-.04.09-.07.13-.1h.01A7.886,7.886,0,0,1,24,16a7.805,7.805,0,0,1,3.87,1.01,7.8,7.8,0,0,0-4.66,1.59H23.2c-.04.03-.08.06-.13.1-.01,0-.02.02-.04.03A8,8,0,0,0,24.13,32Z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/fruit.svg b/app/assets/images/icons/plant_parts/fruit.svg
new file mode 100644
index 000000000..115ac4bcb
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/fruit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#689f38" d="M43.005,8.556c-0.318-0.619-0.605-1.149-0.908-1.641L43,3H7L6.672,3.656C6.501,3.766,6.354,3.875,6.258,3.97C5.337,4.87,4.911,5.563,4.33,6.689C3.943,7.44,3.708,8.302,3.495,9.112C3.367,9.601,3,11,3,11s0.75-0.782,1.539-1.089C4.852,9.789,5.184,9.457,5.404,9.22c0.409-0.442,0.869-1.102,1.275-1.842l0.29,1.013c-0.8,0.943-1.322,1.846-1.973,3.115c-0.581,1.131-0.934,2.43-1.253,3.65C3.55,15.893,3,18,3,18s1.126-1.178,2.309-1.641c0.469-0.184,0.968-0.683,1.298-1.041c0.57-0.618,1.206-1.522,1.782-2.541L11,18c0,0,2.75-5.75,3-6c0.116-0.116,1.203,0.307,2.333,0.794c0.573,1.012,1.206,1.91,1.772,2.524c0.33,0.358,0.829,0.857,1.298,1.041C20.586,16.822,21.712,18,21.712,18s-0.55-2.107-0.743-2.844c-0.118-0.452-0.246-0.915-0.384-1.376c0.233-0.142,0.476-0.274,0.723-0.371c0.469-0.184,0.968-0.683,1.298-1.041c0.38-0.412,0.789-0.958,1.19-1.571L25,12l1.819-1.819c0.519,0.871,1.072,1.642,1.574,2.187c0.237,0.257,0.562,0.584,0.9,0.818c-0.092,0.326-0.178,0.651-0.262,0.971C28.839,14.893,28.288,17,28.288,17s1.126-1.178,2.309-1.641c0.336-0.131,0.685-0.425,0.978-0.712C31.839,14.881,32,15.049,32,15.049s-0.072-0.277-0.173-0.661c0.021-0.023,0.047-0.048,0.067-0.07c0.081-0.088,0.166-0.195,0.249-0.293c0.083,0.099,0.168,0.206,0.249,0.293c0.33,0.358,0.829,0.857,1.298,1.041C34.874,15.822,36,17,36,17s-0.492-1.883-0.707-2.707L37,16h3l0.957-4.146c0.148,0.186,0.295,0.36,0.437,0.514c0.33,0.358,0.829,0.857,1.298,1.041C43.874,13.871,45,15.049,45,15.049s-0.55-2.107-0.743-2.844C43.939,10.987,43.585,9.687,43.005,8.556z"/><path fill="#6d4c41" d="M4.222,3c5.841,17.549,4.792,41.663,4.781,41.906l3.995,0.188C13.045,44.095,14.051,21.088,8.427,3H4.222z"/><path fill="#6d4c41" d="M15.321 3c-4.227 9.476-5.744 23.203-5.813 23.84l2.982.32C12.508 27.003 14.173 11.976 18.64 3H15.321zM23.25 3h-3.266c3.448 7.811 3.025 15.828 3.017 16v7h3l-.003-6.906C26.022 18.723 26.45 11.048 23.25 3z"/><path fill="#6d4c41" d="M30.739,3h-4.359c-4.846,12.505-4.325,40.78-4.298,42.041l3.999-0.082C26.075,44.643,25.495,13.429,30.739,3z"/><path fill="#6d4c41" d="M34.186,3h-3.534c6.34,8.99,6.844,28.815,6.848,29v3h3l0-3.031C40.481,31.103,40.029,13.257,34.186,3z"/><path fill="#6d4c41" d="M44.104,3h-4.149c-3.146,12.283-2.967,40.754-2.957,42.016l4-0.031C40.996,44.672,40.799,13.915,44.104,3z"/><path fill="#ffb300" d="M12.043,21.024c0.51-0.11,1.109,0.216,1.516,0.667c0.276,0.306,0.566,0.509,0.912,0.721c0.37,0.226,0.732,0.478,1.038,0.795c1.106,1.146,1.293,2.891,1.412,4.477c0.019,0.257,0.039,0.514,0.058,0.77c0.025,0.33,0.048,0.671-0.053,0.978c-0.101,0.307-0.36,0.574-0.676,0.567c-0.354-0.008-0.63-0.33-0.906-0.578c-0.607-0.544-1.377-0.785-2.029-1.248c-0.65-0.462-1.043-1.165-1.335-1.907C11.363,24.7,10.091,22.012,12.043,21.024C12.17,20.96,11.935,21.047,12.043,21.024z"/><path fill="#ffc107" d="M34.957 10.024c-.51-.11-1.109.216-1.516.667-.276.306-.566.509-.912.721-.37.226-.732.478-1.038.795-1.106 1.146-1.293 2.891-1.412 4.477-.019.257-.039.514-.058.77-.025.33-.048.671.053.978.101.307.36.574.676.567.354-.008.63-.33.906-.578.607-.544 1.377-.785 2.029-1.248.65-.462 1.043-1.165 1.335-1.907C35.637 13.7 36.909 11.012 34.957 10.024 34.83 9.96 35.065 10.047 34.957 10.024zM40.696 25.016c.34-.073.74.144 1.011.445.184.204.377.339.608.48.247.151.488.319.692.53.737.764.862 1.927.941 2.985.013.171.026.342.039.514.017.22.032.448-.035.652-.067.205-.24.383-.45.378-.236-.005-.42-.22-.604-.385-.405-.363-.918-.523-1.353-.832-.434-.308-.695-.777-.89-1.272C40.242 27.466 39.394 25.675 40.696 25.016 40.78 24.973 40.623 25.032 40.696 25.016zM8.639 17c-1.238.125-2.409 1.004-3.059 2.295-.65 1.291-.762 2.962-.293 4.364.154.459.324.908.523 1.344.253.555.605 1.03.81.995.316-.053.473-.48.686-.77.278-.378.68-.489 1.007-.792.367-.34.849-.947 1.02-1.434C9.835 21.577 10 21.159 10 19.626c0-1.013-.418-2.521-.659-2.57L8.639 17zM23.639 14c-1.238.125-2.409 1.004-3.059 2.295-.65 1.291-.762 2.962-.293 4.364.154.459.324.908.523 1.344.253.555.605 1.03.81.995.316-.053.473-.48.686-.77.278-.378.68-.489 1.007-.792.367-.34.849-.947 1.02-1.434C24.835 18.577 25 18.159 25 16.626c0-1.013-.418-2.521-.659-2.57L23.639 14z"/><path fill="#ffd740" d="M14.571,10c0,0,0.339,0.002,0.571,0c1.087-0.008,2.175,0.881,2.61,2.127c0.528,1.512,0.173,3.353-0.702,4.602c-0.121,0.172-0.312,0.348-0.473,0.235c-0.058-0.041-0.096-0.111-0.136-0.176c-0.322-0.513-0.869-0.718-1.299-1.094c-0.64-0.558-1.007-1.498-1.108-2.449c-0.054-0.505-0.039-1.016,0.018-1.519c0.039-0.347,0.05-0.705,0.141-1.042C14.237,10.518,14.408,10.064,14.571,10z"/><path fill="#ffc107" d="M25.571,25c0,0,0.339,0.002,0.571,0c1.087-0.008,2.175,0.881,2.61,2.127c0.528,1.512,0.173,3.353-0.702,4.602c-0.121,0.172-0.312,0.348-0.473,0.235c-0.058-0.041-0.096-0.111-0.136-0.176c-0.322-0.513-0.869-0.718-1.299-1.094c-0.64-0.558-1.007-1.498-1.108-2.449c-0.054-0.505-0.039-1.016,0.018-1.519c0.039-0.347,0.05-0.705,0.141-1.042C25.237,25.518,25.408,25.064,25.571,25z"/><path fill="#ffd740" d="M38.286,18c0,0-0.424,0.002-0.714,0c-1.359-0.011-2.719,1.133-3.262,2.735c-0.66,1.944-0.217,4.311,0.878,5.917c0.151,0.221,0.39,0.448,0.591,0.302c0.072-0.052,0.12-0.143,0.17-0.226c0.403-0.659,1.086-0.923,1.624-1.406c0.8-0.718,1.259-1.926,1.385-3.149c0.067-0.649,0.049-1.306-0.022-1.954c-0.049-0.447-0.063-0.906-0.177-1.34C38.703,18.667,38.489,18.083,38.286,18z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/leaves.svg b/app/assets/images/icons/plant_parts/leaves.svg
new file mode 100644
index 000000000..3f7da11bd
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/leaves.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#8BC34A" d="M14,35c0,0-2.3-14,13-14c10,0,17,8,17,8s-7.5,12-19,12C16,41,14,35,14,35z M18,18c0-6.1-6-12-6-12s-7.3,4.3-8,13s5.8,10.7,5.8,10.7S18,26.8,18,18z"/><path fill="#689F38" d="M44,29c0,0-7.5,12-19,12c-6,0-8.9-2.7-10.2-4.5c-2.9,2.5-3.9,4.8-3.9,4.9C10.8,41.8,10.4,42,10,42c-0.1,0-0.3,0-0.4-0.1c-0.5-0.2-0.7-0.8-0.5-1.3c0.1-0.3,2.6-5.8,10.2-9.4C30.3,25.4,44,29,44,29z M11,35c0.1,0,0.2,0,0.3-0.1c0.5-0.2,0.8-0.8,0.6-1.3c-0.5-1.5-0.9-2.9-1.1-4.4C13,28.2,18,24.9,18,18c0-6.1-6-12-6-12s-0.4,1.1-1,3c0,0,0,0,0,0c-0.2,0.5-5.2,13.6-0.9,25.3C10.2,34.7,10.6,35,11,35z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/pod.svg b/app/assets/images/icons/plant_parts/pod.svg
new file mode 100644
index 000000000..b06004f4c
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/pod.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 48 48"><path fill="#7CB342" d="M42.36,3.967c-1.839,0-7.27,0.669-11.36,8.033c-5,9-6,10-8,12S11,34,11,34s-5,4-6,8c0,0,1.943,2,5.972,2S23,44,34,33c8-9,8-19,8-19s0-2,0-6c0-3.162,1-4,1-4S42.769,3.967,42.36,3.967L42.36,3.967z"/><path fill="#388E3C" d="M32.748,12.971c-5.136,9.245-6.204,10.314-8.334,12.443c-2.055,2.055-11.753,9.818-12.165,10.147c-1.058,0.851-3.663,3.288-4.838,5.676C8.157,41.606,9.335,42,10.972,42c3.909,0,11.18,0,21.572-10.372c7.32-8.268,7.455-17.541,7.456-17.633V8c0-0.626,0.034-1.186,0.094-1.688C38.004,6.935,35.17,8.612,32.748,12.971z"/><path fill="#C5E1A5" d="M34.5 18A2.5 2.5 0 1 0 34.5 23 2.5 2.5 0 1 0 34.5 18zM37 11A2 2 0 1 0 37 15 2 2 0 1 0 37 11zM30 24A3 3 0 1 0 30 30 3 3 0 1 0 30 24zM24.5 30A2.5 2.5 0 1 0 24.5 35 2.5 2.5 0 1 0 24.5 30zM19 35A2 2 0 1 0 19 39 2 2 0 1 0 19 35zM13 37A2 2 0 1 0 13 41 2 2 0 1 0 13 37z"/><path fill="#8BC34A" d="M43,4c0,0-7-1-12,8s-6,10-8,12S11,34,11,34s-5,4-6,8c0,0,10-3,21-14c8-9,7-13,13-20C41.058,5.599,43,4,43,4z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/seeds.svg b/app/assets/images/icons/plant_parts/seeds.svg
new file mode 100644
index 000000000..c8652e798
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/seeds.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#689f38" d="M16.976 3c-1.671.09-5.807 3.942-7 6-2.907 5.013-3.943 8.571-5.154 14.24C4.015 27.02 3.976 31.141 3.976 35c0 2.333 0 9 0 9s2.315-4.303 5.32-6.513c1.193-.877 2.235-2.715 2.904-4.014 2.421-4.699 5.776-12.302 5.776-19.473C17.976 10.5 18.245 6.162 16.976 3M27 18.235c1.169-.213 4.686 1.64 5.862 2.795 2.866 2.814 4.191 4.978 5.998 8.497 1.205 2.347 1.938 5.043 2.599 7.572C41.858 38.629 43 43 43 43s-2.336-2.444-4.79-3.404c-.974-.381-2.008-1.416-2.693-2.159-2.477-2.687-5.576-7.944-6.805-12.646-.599-2.294-1.05-4.511-.715-6.79"/><path fill="#6d4c41" d="M13.326,3C19.833,21.5,16.003,44.753,16,45h13.999C30.012,43.968,33.333,22.333,28,3H13.326z"/><path fill="#ffc107" d="M17.917,10c-3.714,0.335-7.227,2.677-9.177,6.117s-2.286,7.895-0.88,11.633c0.461,1.225,0.973,2.42,1.569,3.583c0.758,1.479,1.815,2.745,2.431,2.653c0.949-0.141,1.418-1.28,2.058-2.052c0.833-1.007,2.04-1.304,3.02-2.111C18.041,28.916,19.484,27.3,20,26c1.506-3.798,2-4.912,2-9c0-2.701-1.255-6.721-1.977-6.851L17.917,10z"/><path fill="#ffb300" d="M22.975,7.838c1.044-0.956,2.801-1.028,4.26-0.548c0.991,0.326,1.892,0.396,2.933,0.408c1.114,0.013,2.237,0.096,3.309,0.407c3.874,1.123,6.333,4.895,8.45,8.394c0.343,0.566,0.686,1.133,1.028,1.699c0.441,0.729,0.892,1.484,1.017,2.331c0.125,0.848-0.161,1.821-0.894,2.239c-0.822,0.47-1.832,0.106-2.755-0.085c-2.027-0.421-4.076,0.084-6.115-0.087c-2.032-0.171-3.751-1.254-5.286-2.566C25.683,17.262,19.637,12.808,22.975,7.838C23.191,7.515,22.753,8.041,22.975,7.838z"/><path fill="#ffd740" d="M24,19c0,0,1.187,0.006,2,0c3.804-0.026,7.612,2.77,9.134,6.685c1.847,4.752,0.607,10.537-2.458,14.463c-0.422,0.54-1.093,1.095-1.655,0.739c-0.202-0.127-0.335-0.349-0.477-0.552c-1.127-1.612-3.04-2.256-4.547-3.437c-2.239-1.754-3.525-4.708-3.879-7.698c-0.188-1.586-0.137-3.193,0.061-4.775c0.137-1.092,0.176-2.215,0.495-3.275C22.831,20.629,23.43,19.202,24,19z"/><path fill="#ffa000" d="M20.023,10.149c0,0-0.433,0.169-1.123,0.553c-0.354,0.17-0.754,0.445-1.223,0.708c-0.446,0.315-0.964,0.629-1.472,1.05c-0.536,0.381-1.028,0.894-1.58,1.381c-0.257,0.264-0.493,0.562-0.749,0.849c-0.264,0.28-0.499,0.59-0.715,0.924c-0.214,0.333-0.483,0.636-0.662,1.002c-0.178,0.366-0.361,0.731-0.56,1.092c-0.226,0.348-0.3,0.772-0.456,1.158c-0.119,0.401-0.32,0.776-0.376,1.198l-0.259,1.24c-0.041,0.207-0.095,0.411-0.125,0.619l-0.034,0.633c-0.014,0.842-0.196,1.668-0.087,2.485c0.074,0.811,0.025,1.611,0.135,2.361c0.124,0.747,0.216,1.463,0.299,2.129c0.064,0.67,0.215,1.268,0.328,1.805c0.121,0.535,0.207,1.011,0.283,1.403c0.146,0.786,0.214,1.247,0.214,1.247s-0.224-0.397-0.588-1.114c-0.18-0.359-0.403-0.796-0.638-1.307c-0.241-0.509-0.534-1.08-0.711-1.752c-0.213-0.661-0.441-1.384-0.657-2.157c-0.216-0.773-0.294-1.629-0.421-2.504c-0.164-0.872-0.102-1.806-0.081-2.746l0.024-0.709c0.027-0.236,0.081-0.472,0.12-0.709l0.264-1.426c0.082-0.477,0.316-0.92,0.468-1.378c0.191-0.446,0.3-0.923,0.567-1.329c0.232-0.421,0.476-0.831,0.72-1.231c0.242-0.402,0.574-0.736,0.85-1.095c0.282-0.357,0.566-0.7,0.91-0.973c0.328-0.287,0.634-0.581,0.956-0.835c0.671-0.478,1.301-0.925,1.947-1.227c0.612-0.357,1.233-0.561,1.758-0.772c0.545-0.172,1.014-0.32,1.416-0.393c0.391-0.095,0.717-0.128,0.931-0.154C19.909,10.15,20.023,10.149,20.023,10.149z"/><path fill="#ffa000" d="M20.023,10.149c0,0-0.78,1.431-1.778,3.581c-0.488,1.083-1.054,2.336-1.591,3.705c-0.293,0.673-0.528,1.396-0.807,2.113c-0.295,0.711-0.506,1.466-0.765,2.203c-0.257,0.738-0.473,1.49-0.709,2.223c-0.193,0.745-0.419,1.471-0.62,2.179c-0.175,0.714-0.351,1.405-0.528,2.061c-0.184,0.654-0.291,1.287-0.442,1.864c-0.123,0.581-0.289,1.111-0.373,1.589c-0.092,0.477-0.193,0.893-0.272,1.237c-0.164,0.688-0.276,1.084-0.276,1.084s-0.056-0.402-0.121-1.11c-0.029-0.354-0.07-0.786-0.093-1.281c-0.044-0.497-0.02-1.053-0.004-1.663c0.027-0.608,0.006-1.278,0.109-1.969c0.082-0.694,0.145-1.434,0.279-2.187c0.157-0.747,0.277-1.533,0.478-2.312c0.224-0.772,0.424-1.566,0.675-2.345c0.293-0.764,0.538-1.546,0.868-2.282c0.301-0.747,0.652-1.459,1.006-2.139c0.328-0.692,0.732-1.319,1.091-1.921c0.368-0.598,0.748-1.144,1.114-1.635c0.721-0.99,1.422-1.74,1.924-2.246C19.699,10.398,20.023,10.149,20.023,10.149z"/><path fill="#ffa000" d="M20.023,10.149c0,0,0.062,0.406,0.138,1.114c0.062,0.712,0.191,1.712,0.181,2.939c0.003,0.612,0.025,1.279-0.016,1.981c-0.047,0.701-0.077,1.444-0.167,2.208c-0.13,0.763-0.182,1.563-0.388,2.36c-0.096,0.4-0.193,0.802-0.29,1.207l-0.38,1.206c-0.297,0.791-0.64,1.578-1.052,2.308c-0.385,0.746-0.884,1.404-1.341,2.025c-0.457,0.625-0.939,1.174-1.368,1.703c-0.424,0.535-0.837,1.022-1.191,1.496c-0.714,0.941-1.284,1.765-1.662,2.36c-0.384,0.592-0.624,0.931-0.624,0.931s0.082-0.398,0.262-1.094c0.084-0.351,0.209-0.769,0.392-1.236c0.16-0.478,0.377-1.003,0.653-1.559c0.523-1.124,1.307-2.358,2.089-3.599c0.395-0.621,0.748-1.271,1.087-1.932c0.348-0.658,0.626-1.361,0.876-2.078l0.375-1.08c0.101-0.371,0.201-0.741,0.3-1.108c0.2-0.733,0.356-1.481,0.531-2.194c0.133-0.726,0.281-1.429,0.423-2.096c0.125-0.672,0.244-1.308,0.354-1.894c0.242-1.172,0.404-2.184,0.564-2.875C19.917,10.546,20.023,10.149,20.023,10.149z"/><g><path fill="#ffb300" d="M24,19c0,0,0.166,1.498,0.416,3.744c0.14,1.108,0.305,2.389,0.553,3.73c0.252,1.338,0.584,2.742,1.08,4.04c0.244,0.65,0.541,1.266,0.879,1.826c0.351,0.566,0.708,1.014,1.216,1.563c0.929,1.034,1.83,2.071,2.429,3.124c0.305,0.524,0.514,1.058,0.627,1.545c0.13,0.485,0.114,0.931,0.089,1.276c-0.087,0.698-0.29,1.035-0.269,1.04c0,0-0.006-0.095-0.018-0.274c-0.001-0.176-0.053-0.434-0.114-0.741c-0.143-0.624-0.546-1.394-1.257-2.173c-0.721-0.779-1.699-1.594-2.75-2.558c-0.49-0.442-1.142-1.055-1.583-1.741c-0.468-0.679-0.825-1.424-1.117-2.176c-0.579-1.512-0.831-3.076-0.95-4.525c-0.073-0.724-0.067-1.427-0.061-2.088c0.002-0.661,0.05-1.285,0.107-1.857C23.495,20.463,24,19,24,19z"/><path fill="#ffb300" d="M24,19c0,0,0.196,0.327,0.507,0.909c0.146,0.296,0.346,0.646,0.578,1.025c0.233,0.384,0.47,0.813,0.773,1.278c0.578,0.934,1.291,1.994,2.051,3.148c0.762,1.156,1.591,2.387,2.329,3.72c0.367,0.662,0.72,1.348,1.022,2.047c0.15,0.352,0.292,0.705,0.425,1.055c0.111,0.363,0.22,0.722,0.327,1.076c0.117,0.347,0.181,0.713,0.238,1.066c0.051,0.356,0.135,0.692,0.133,1.04c0.013,0.341,0.026,0.673,0.038,0.994c0.003,0.319-0.064,0.631-0.092,0.924c-0.046,0.293-0.051,0.575-0.128,0.834c-0.078,0.256-0.153,0.499-0.223,0.728c-0.072,0.226-0.13,0.437-0.202,0.626c-0.093,0.182-0.178,0.349-0.255,0.5c-0.311,0.597-0.502,0.917-0.502,0.917s0.036-0.388,0.12-1.029c0.022-0.158,0.047-0.334,0.073-0.525c0.003-0.193,0.007-0.401,0.011-0.623c0.016-0.44,0.029-0.927-0.044-1.455c-0.021-0.527-0.154-1.083-0.274-1.665c-0.04-0.293-0.167-0.583-0.259-0.881c-0.108-0.296-0.167-0.607-0.311-0.908c-0.125-0.303-0.251-0.612-0.38-0.924c-0.158-0.305-0.31-0.616-0.457-0.932c-0.317-0.625-0.648-1.261-1.01-1.892c-0.702-1.267-1.453-2.553-2.096-3.802c-0.334-0.62-0.625-1.238-0.887-1.837c-0.281-0.585-0.492-1.171-0.682-1.71c-0.211-0.525-0.334-1.053-0.454-1.503c-0.135-0.449-0.198-0.843-0.241-1.17C24.037,19.379,24,19,24,19z"/><path fill="#ffb300" d="M24,19c0,0,0.104,0.017,0.3,0.049c0.194,0.034,0.488,0.074,0.848,0.172c0.722,0.185,1.754,0.529,2.886,1.189c0.558,0.337,1.161,0.727,1.726,1.23c0.584,0.482,1.15,1.058,1.663,1.713c0.517,0.651,1.003,1.367,1.403,2.146c0.385,0.83,0.717,1.486,1.015,2.396c0.155,0.43,0.267,0.861,0.359,1.29c0.109,0.427,0.2,0.857,0.25,1.293c0.073,0.431,0.12,0.863,0.118,1.294c0.02,0.429,0.025,0.852-0.01,1.268c-0.015,0.416-0.045,0.824-0.126,1.218c-0.055,0.396-0.144,0.776-0.241,1.143c-0.173,0.738-0.439,1.404-0.709,1.998c-0.541,1.192-1.187,2.065-1.665,2.634c-0.485,0.568-0.798,0.853-0.798,0.853s0.18-0.387,0.461-1.059c0.28-0.671,0.642-1.637,0.924-2.806c0.136-0.586,0.252-1.222,0.326-1.894c0.04-0.336,0.073-0.68,0.07-1.035c0.014-0.353,0.026-0.711,0.003-1.076c0.002-0.365-0.035-0.734-0.085-1.106c-0.031-0.373-0.105-0.746-0.172-1.123c-0.052-0.379-0.144-0.754-0.252-1.128c-0.092-0.38-0.2-0.752-0.339-1.102c-0.191-0.684-0.575-1.538-0.861-2.201c-0.35-0.679-0.68-1.359-1.095-1.961c-0.413-0.601-0.827-1.181-1.283-1.682c-0.447-0.509-0.913-0.956-1.354-1.367c-0.907-0.789-1.753-1.374-2.369-1.757C24.377,19.205,24,19,24,19z"/></g><g><path fill="#fb8c00" d="M23,8c0,0-0.178,0.405-0.148,1.113c0.012,0.703,0.302,1.665,0.989,2.604c0.678,0.945,1.715,1.876,2.944,2.725c0.607,0.436,1.271,0.846,1.958,1.242c0.698,0.381,1.396,0.792,2.13,1.146c0.372,0.189,0.714,0.354,1.1,0.527c0.372,0.183,0.748,0.378,1.103,0.534c0.713,0.332,1.44,0.639,2.132,0.923c0.695,0.29,1.378,0.497,2.034,0.702c0.657,0.199,1.311,0.327,1.936,0.509c0.628,0.173,1.204,0.381,1.684,0.612c0.481,0.229,0.877,0.46,1.189,0.671c0.321,0.193,0.544,0.391,0.706,0.507C42.915,21.935,43,22,43,22s-0.409-0.108-1.123-0.297c-0.712-0.189-1.701-0.394-2.906-0.466c-0.61-0.027-1.303-0.075-2.051-0.174c-0.749-0.089-1.53-0.28-2.31-0.516c-0.791-0.219-1.561-0.535-2.349-0.871c-0.782-0.328-1.525-0.681-2.289-1.1c-1.523-0.785-2.97-1.746-4.226-2.8c-1.231-1.081-2.265-2.284-2.83-3.525c-0.585-1.232-0.632-2.435-0.424-3.178c0.09-0.377,0.234-0.646,0.335-0.819C22.929,8.079,23,8,23,8z"/><path fill="#fb8c00" d="M22.908,8.395c0,0,0.315,0.231,0.843,0.657c0.251,0.234,0.616,0.417,0.975,0.686c0.351,0.268,0.835,0.498,1.294,0.8c0.492,0.269,1.023,0.555,1.592,0.848c0.579,0.28,1.19,0.576,1.821,0.882c1.276,0.601,2.658,1.224,4.032,1.921c1.37,0.698,2.729,1.456,3.937,2.289c0.62,0.388,1.175,0.837,1.704,1.253c0.54,0.399,0.99,0.863,1.423,1.255c0.433,0.395,0.777,0.818,1.098,1.168c0.329,0.341,0.561,0.693,0.765,0.966C42.791,21.675,43,22,43,22s-0.334-0.211-0.886-0.595c-0.276-0.192-0.599-0.433-0.994-0.678c-0.396-0.243-0.817-0.543-1.299-0.837c-0.495-0.279-0.996-0.617-1.561-0.928c-0.562-0.31-1.155-0.638-1.769-0.976c-0.607-0.347-1.272-0.647-1.921-0.998c-0.663-0.335-1.337-0.675-2.011-1.016c-1.35-0.685-2.713-1.401-3.958-2.157c-0.632-0.36-1.215-0.769-1.765-1.16c-0.554-0.384-1.046-0.805-1.49-1.193c-0.43-0.418-0.831-0.766-1.135-1.163c-0.308-0.378-0.595-0.691-0.757-0.986C23.097,8.736,22.908,8.395,22.908,8.395z"/><path fill="#fb8c00" d="M23,8c0,0,0.401,0.112,1.093,0.258c0.338,0.08,0.76,0.138,1.235,0.215c0.48,0.059,1.018,0.105,1.611,0.142c0.601,0.028,1.253,0.057,1.942,0.089c0.698,0.044,1.465,0.08,2.257,0.244c0.789,0.16,1.626,0.369,2.415,0.735c0.4,0.19,0.766,0.366,1.174,0.624l0.511,0.322l0.545,0.402c0.717,0.548,1.294,1.137,1.878,1.734c0.572,0.596,1.077,1.229,1.547,1.848c0.942,1.237,1.698,2.47,2.273,3.564c0.585,1.087,0.979,2.045,1.216,2.728C42.931,21.592,43,22,43,22s-0.23-0.344-0.659-0.905c-0.431-0.563-1.067-1.345-1.828-2.273c-0.772-0.92-1.675-1.981-2.669-3.074c-0.493-0.55-1.038-1.079-1.568-1.629c-0.537-0.53-1.131-1.059-1.694-1.499l-0.417-0.334l-0.502-0.337c-0.265-0.182-0.618-0.368-0.931-0.527c-0.64-0.335-1.311-0.586-1.991-0.78c-0.682-0.184-1.368-0.355-2.047-0.483c-0.677-0.129-1.33-0.274-1.935-0.434c-1.214-0.307-2.181-0.737-2.812-1.108c-0.326-0.164-0.54-0.348-0.704-0.45C23.085,8.058,23,8,23,8z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/tuber.svg b/app/assets/images/icons/plant_parts/tuber.svg
new file mode 100644
index 000000000..2a96312c2
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/tuber.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#EF6C00" d="M43,6c-0.1-1.1-1-1-1-1s-12.3-0.8-19.1,6c-3.7,3.8-5,7.8-6.2,11.4c-0.7,2.1-1.6,3.9-2.4,5.7C12.1,33,10.5,34.4,9,35c-0.7,0.3-3.4,0.2-4,1.4c-0.3,0.6,0.1,1.3,0.7,2c2.3,2.3,7.2,4.6,13,4.6c0.2,0,0.4,0,0.6,0c4.4-0.1,9.9-0.9,15.7-7c4.7-4.9,5.9-12.3,5.9-18c0-3.1-0.4-5.6-0.9-7C39.1,8.1,43,6.9,43,6z"/><path fill="#BF360C" d="M34,18c-0.4,0-0.7-0.2-0.9-0.5C31.8,15,29,15,29,15c0,0,0,0,0,0c-0.5,0-1-0.4-1-1c0-0.6,0.4-1,1-1c0.2,0,4-0.1,5.9,3.5c0.3,0.5,0.1,1.1-0.4,1.4C34.3,18,34.2,18,34,18z M35.5,25.9c0.5-0.3,0.7-0.9,0.4-1.3c-1.5-3-4.6-3.5-4.7-3.5c-0.6-0.1-1.1,0.3-1.1,0.8c-0.1,0.5,0.3,1.1,0.8,1.1c0,0,2.2,0.4,3.3,2.5c0.2,0.3,0.5,0.5,0.9,0.5C35.2,26,35.3,26,35.5,25.9z M25.4,26.9c0.5-0.2,0.8-0.8,0.5-1.3c-1-2.4-3.7-2.6-3.9-2.6c-0.5,0-1,0.4-1.1,0.9c0,0.5,0.4,1,0.9,1.1c0,0,1.7,0.2,2.2,1.4c0.2,0.4,0.5,0.6,0.9,0.6C25.1,27,25.3,27,25.4,26.9z M28.2,36c0.5-0.1,0.9-0.6,0.8-1.2c-0.4-1.7-1.9-2.6-2.7-2.8c-0.5-0.1-1.1,0.2-1.2,0.7c-0.1,0.5,0.2,1.1,0.7,1.2c0,0,1.1,0.3,1.3,1.2c0.1,0.5,0.5,0.8,1,0.8C28.1,36,28.1,36,28.2,36z M19.2,36c0.5-0.1,0.9-0.6,0.8-1.2c-0.4-1.8-1.9-2.6-2.8-2.8c-0.5-0.1-1.1,0.2-1.2,0.8c-0.1,0.5,0.2,1.1,0.8,1.2c0,0,1,0.2,1.2,1.2c0.1,0.5,0.5,0.8,1,0.8C19.1,36,19.1,36,19.2,36z"/><path fill="#D84315" d="M21,40c-7.8,0.4-9-5-9-5s-0.1-1.4,0.5-3.4c-1.3,2.1-2.4,2.9-3.5,3.4c-0.4,0.2-1.7,0.2-2.6,0.5c-0.6,0.2-1.1,0.5-1.3,0.9C5,36.6,4.9,36.7,5,36.9c0,0.5,0.3,1,0.8,1.5c2.3,2.3,7.2,4.6,13,4.6c0.2,0,0.4,0,0.6,0c1.6,0,3.4-0.2,5.3-0.6c1.6-0.4,3.3-1,5-2c0.7-0.4,1.4-0.9,2.1-1.4s1.4-1.1,2.2-1.8c0.4-0.3,0.7-0.7,1.1-1.1c1.8-1.8,3-4,3.9-6.4c0.3-0.8,0.6-1.6,0.8-2.4s0.4-1.6,0.6-2.4c0.2-0.8,0.3-1.6,0.4-2.4c0.1-1.2,0.2-2.3,0.2-3.4c0-0.4,0-0.7,0-1.1C41.2,30.9,28.8,39.6,21,40z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/planting-add.svg b/app/assets/images/icons/planting-add.svg
new file mode 100644
index 000000000..dd025e3c6
--- /dev/null
+++ b/app/assets/images/icons/planting-add.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1">
+<g id="surface1025178">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,76.470588%,29.019608%);fill-opacity:1;" d="M 24 25 C 23.398438 25 23 24.5 23 24 C 23 23.898438 23.101562 18.398438 19.699219 16.300781 C 19.199219 16 19.101562 15.398438 19.398438 14.898438 C 19.699219 14.398438 20.300781 14.300781 20.800781 14.601562 C 25.199219 17.398438 25.101562 23.800781 25.101562 24.101562 C 25 24.601562 24.5 25 24 25 Z M 24 25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,76.470588%,29.019608%);fill-opacity:1;" d="M 20.199219 7 C 15.398438 4.601562 7.898438 7.300781 6 8 C 8.800781 9.699219 8.398438 18.898438 13.5 20.601562 C 17.101562 21.800781 19.898438 20.398438 20.199219 15.398438 C 24.199219 13.101562 23.601562 8.699219 20.199219 7 Z M 24 28 C 23.398438 28 23 27.601562 23 27 L 23 24 C 23 16.199219 28.800781 15 28.800781 15 C 29.300781 14.898438 29.898438 15.300781 30 15.800781 C 30.101562 16.300781 29.699219 16.898438 29.199219 17 C 29 17 25 17.898438 25 24 L 25 27 C 25 27.601562 24.601562 28 24 28 Z M 24 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,76.470588%,29.019608%);fill-opacity:1;" d="M 30.199219 8.300781 C 34.601562 6.898438 40.601562 11 42 12 C 39.398438 13 37.699219 21.300781 33.101562 21.898438 C 29.898438 22.300781 28.199219 20.601562 29 16 C 25.398438 13.199219 27.101562 9.199219 30.199219 8.300781 Z M 30.199219 8.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,62.352941%,21.960784%);fill-opacity:1;" d="M 13.5 20.601562 C 8.398438 18.898438 8.800781 9.699219 6 8 C 8.5 8.199219 12.101562 10.398438 20.199219 15.398438 C 19.898438 20.398438 17.199219 21.800781 13.5 20.601562 Z M 33.199219 21.898438 C 37.699219 21.300781 39.398438 13 42.101562 12 C 40 11.699219 36.699219 12.898438 29.101562 16 C 27.398438 20.5 29.898438 22.398438 33.199219 21.898438 Z M 33.199219 21.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(90.196078%,29.019608%,9.803922%);fill-opacity:1;" d="M 13 27 L 16 42 L 32 42 L 35 27 Z M 13 27 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(74.901961%,21.176471%,4.705882%);fill-opacity:1;" d="M 35 30 L 13 30 C 12.398438 30 12 29.5 12 29 L 12 25 L 36 25 L 36 29 C 36 29.5 35.5 30 35 30 Z M 35 30 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(26.27451%,62.745098%,27.843137%);fill-opacity:1;" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36 "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/planting-hand.svg b/app/assets/images/icons/planting-hand.svg
new file mode 100644
index 000000000..03731c9a6
--- /dev/null
+++ b/app/assets/images/icons/planting-hand.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#e39d36" d="M32.4,29.1l-13.2,7.8c0,0,3.1,4,3.1,4l12.6-7.6c1.2-0.7,1.5-2.2,0.8-3.3 C35.1,28.8,33.6,28.4,32.4,29.1"/><path fill="#689f38" d="M32.7,13.2C31.1,8.5,23.8,5.7,22,5c0.8,2.9-4.8,8.8-2.5,13.2c1.6,3.1,4.6,4,8,0.8 C31.3,19.9,33.9,16.5,32.7,13.2z"/><path fill="#8bc34a" d="M27,26C27,26,27,26,27,26c-0.6,0-1-0.5-1-1.1c0-0.1,0.5-7.9-2.9-11.7c-0.4-0.4-0.3-1,0.1-1.4 c0.4-0.4,1-0.3,1.4,0.1c3.9,4.5,3.4,12.8,3.4,13.2C28,25.6,27.5,26,27,26z"/><path fill="#8bc34a" d="M19.6,18.2C17.3,13.8,22.8,7.9,22,5c1.5,1.7,3.5,5.5,5.5,14c0,0,0,0,0,0 C24.1,22.2,21.2,21.3,19.6,18.2z"/><path fill="#795548" d="M27 27c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S27 25.3 27 27zM33 32c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S33 30.3 33 32z"/><path fill="#795548" d="M30 29c0-1.7-1.6-3-3.5-3S23 27.3 23 29s1.6 3 3.5 3S30 30.7 30 29zM23 28c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S23 26.3 23 28z"/><path fill="#795548" d="M31 26.5c0 1.4-1.1 2.5-2.5 2.5S26 27.9 26 26.5s1.1-2.5 2.5-2.5S31 25.1 31 26.5zM36 30c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2S36 28.9 36 30z"/><path fill="#795548" d="M34,27.5c0,1.4-1.1,2.5-2.5,2.5S29,28.9,29,27.5s1.1-2.5,2.5-2.5S34,26.1,34,27.5z"/><path fill="#ffb74d" d="M38.9,30.4l-12.4,7.3c0,0,0,0,0,0l-5.9-3.4l2.9,1.6c1.3,0.7,2.9,0.5,3.9-0.6 c1.3-1.5,0.9-3.8-0.8-4.7l-12.4-6.8c-1.1-0.6-2.5-0.6-3.7,0L5,27.1c0,0,0,0,0,0.1v10.7l4-2.6l15.1,8.2c1.2,0.6,2.6,0.6,3.8-0.1 l13.8-8.3c1.3-0.8,1.7-2.4,0.9-3.7C41.9,30.1,40.2,29.7,38.9,30.4"/><path fill="#eda740" d="M27.5,35.4c-0.7,0.9-1.9,1.2-3,1l-0.2,0.1l2.2,1.3l12.4-7.3c0.1-0.1,0.2-0.1,0.3-0.1 c-0.7-1.1-2.1-1.4-3.2-0.7l-7.8,4.6C28,34.6,27.8,35,27.5,35.4z"/><path fill="#eda740" d="M26.5,37.8L26.5,37.8l-1.3-0.9l-10.7-6l8,6.6C23.7,38.4,25.2,38.5,26.5,37.8"/><path fill="#ffcc80" d="M24.4,35.2c-0.9-0.5-0.6-1.3-0.1-2.2c0.5-0.9,0.9-1.6,1.8-1.1s1.3,1.6,0.8,2.5 C26.5,35.3,25.4,35.6,24.4,35.2"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/planting-sun.svg b/app/assets/images/icons/planting-sun.svg
new file mode 100644
index 000000000..4b69d1d59
--- /dev/null
+++ b/app/assets/images/icons/planting-sun.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144" height="144"><path fill="#8bc34a" d="M23,43c-0.6,0-1-0.4-1-1c0-0.2-0.1-5.4-5.4-8.1c-0.5-0.2-0.7-0.8-0.4-1.3c0.2-0.5,0.8-0.7,1.3-0.4 c6.5,3.2,6.6,9.6,6.6,9.9C24,42.6,23.6,43,23,43z"/><path fill="#8bc34a" d="M19.6 26.8C15.5 24.6 8.6 27.4 7 28c2.4 1.5 2.5 9.2 6.9 10.7 3.1 1.1 5.7-.3 5.9-4.6C23 32.3 22.5 28.3 19.6 26.8zM23 43c-.6 0-1-.4-1-1 0-6.7 4.6-7.9 4.8-8 .5-.1 1.1.2 1.2.7.1.5-.2 1.1-.7 1.2-.1 0-3.3 1-3.3 6C24 42.6 23.6 43 23 43z"/><path fill="#8bc34a" d="M27.8,28.2c3.8-1.1,9,2,10.2,2.8c-2.3,0.8-3.7,7.5-7.7,8c-2.8,0.3-4.7-1.2-4.1-4.8 C23.9,32.1,25.1,29,27.8,28.2z"/><path fill="#689f38" d="M13.9 38.7C9.5 37.2 9.4 29.5 7 28c0 0 0 0 0 0 2.1.2 5.9 1.6 12.8 6 0 0 0 0 0 0C19.6 38.4 17 39.7 13.9 38.7zM30.3 39c3.9-.5 5.4-7.1 7.7-8 0 0 0 0 0 0-1.8-.2-5.2.7-11.8 3.1 0 0 0 0 0 0C25.6 37.8 27.5 39.3 30.3 39z"/><path fill="#ff9800" d="M25,8h13v13H25V8z"/><path fill="#ff9800" d="M31.5,24L22,14.5L31.5,5l9.5,9.5L31.5,24z"/><path fill="#ffeb3b" d="M27,14.5c0,2.5,2,4.5,4.5,4.5s4.5-2,4.5-4.5c0-2.5-2-4.5-4.5-4.5S27,12,27,14.5"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/planting.svg b/app/assets/images/icons/planting.svg
index 48d867aa0..bb37c3756 100644
--- a/app/assets/images/icons/planting.svg
+++ b/app/assets/images/icons/planting.svg
@@ -1,5 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" " d="M 23.398438 14.023438 C 23.058594 14.042969 22.835938 13.933594 22.808594 13.914063 L 21.121094 14.992188 C 21.492188 15.574219 22.257813 15.96875 23.117188 16.019531 C 23.183594 16.023438 23.25 16.023438 23.316406 16.023438 C 24.445313 16.023438 25.554688 15.453125 26.394531 14.4375 C 27.828125 12.695313 28.835938 10.847656 28.878906 10.769531 L 29.332031 9.929688 L 28.515625 9.4375 C 23.984375 6.714844 21.394531 8.007813 20.492188 8.691406 C 19.328125 9.574219 18.796875 11.019531 19.089844 12.429688 C 18.160156 13.023438 17.234375 13.773438 16.496094 14.6875 C 16.070313 13.691406 15.40625 12.796875 14.632813 12.007813 C 14.703125 11.824219 14.75 11.644531 14.78125 11.511719 C 14.796875 11.441406 14.8125 11.375 14.832031 11.316406 C 15.34375 9.601563 14.640625 7.601563 13.082031 6.34375 C 11.972656 5.449219 8.820313 3.683594 3.519531 6.605469 L 2.835938 6.980469 L 3.03125 7.730469 C 3.070313 7.882813 4.015625 11.445313 5.894531 13.53125 C 6.707031 14.433594 7.726563 14.941406 8.847656 14.996094 C 8.917969 15 8.988281 15 9.054688 15 C 10.3125 15 11.390625 14.441406 11.828125 14.042969 L 10.484375 12.5625 C 10.46875 12.574219 8.789063 13.753906 7.382813 12.191406 C 6.292969 10.984375 5.550781 9.046875 5.199219 7.984375 C 8.984375 6.160156 11.078125 7.296875 11.824219 7.898438 C 12.699219 8.605469 13.132813 9.648438 12.953125 10.554688 C 10.800781 8.960938 8.558594 8.070313 8.378906 8.003906 L 7.65625 9.867188 C 9.699219 10.65625 15 13.484375 15 17 L 15 20.144531 C 14.238281 20.34375 13.542969 20.753906 13.019531 21.34375 C 12.550781 21.117188 12.035156 21 11.5 21 C 10.070313 21 8.839844 21.859375 8.296875 23.09375 C 8.035156 23.03125 7.769531 23 7.5 23 C 5.570313 23 4 24.570313 4 26.5 L 4 27 L 6 27 L 6 26.5 C 6 25.671875 6.671875 25 7.5 25 C 7.902344 25 8.210938 25.167969 8.398438 25.308594 L 10 24.511719 L 10 24.496094 C 10.003906 23.671875 10.675781 23 11.5 23 C 11.902344 23 12.28125 23.160156 12.566406 23.449219 L 14.1875 23.167969 C 14.515625 22.457031 15.226563 22 16 22 C 16.726563 22 17.398438 22.40625 17.75 23.0625 L 19.328125 23.304688 C 19.527344 23.109375 19.792969 23 20.070313 23 C 20.65625 23 21.136719 23.480469 21.136719 24.066406 C 21.136719 24.183594 21.113281 24.300781 21.066406 24.429688 L 22.671875 25.519531 C 22.9375 25.28125 23.382813 25 24 25 C 25.101563 25 26 25.898438 26 27 L 28 27 C 28 24.792969 26.207031 23 24 23 C 23.65625 23 23.316406 23.046875 22.992188 23.132813 C 22.59375 21.894531 21.433594 21 20.070313 21 C 19.652344 21 19.253906 21.082031 18.878906 21.238281 C 18.367188 20.703125 17.714844 20.332031 17 20.144531 L 17 19 L 17.003906 19 L 17.003906 18.671875 C 17.003906 14.519531 23.535156 12.53125 23.601563 12.511719 L 23.039063 10.59375 C 22.9375 10.621094 22.121094 10.871094 21.046875 11.363281 C 21.125 10.949219 21.339844 10.5625 21.703125 10.289063 C 22.761719 9.484375 24.558594 9.636719 26.617188 10.675781 C 26.214844 11.332031 25.589844 12.273438 24.851563 13.167969 C 24.300781 13.835938 23.757813 14.003906 23.398438 14.023438 Z M 13.484375 10.820313 L 13.496094 10.976563 C 13.445313 10.9375 13.390625 10.898438 13.339844 10.855469 C 13.386719 10.84375 13.429688 10.824219 13.484375 10.820313 Z "/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144" height="144"><path fill="#8bc34a" d="M24,25C24,25,24,25,24,25c-0.6,0-1-0.5-1-1c0-0.1,0.1-5.6-3.3-7.7c-0.5-0.3-0.6-0.9-0.3-1.4 c0.3-0.5,0.9-0.6,1.4-0.3c4.4,2.8,4.3,9.2,4.3,9.5C25,24.6,24.5,25,24,25z"/><path fill="#8bc34a" d="M20.2 7C15.4 4.6 7.9 7.3 6 8c2.8 1.7 2.4 10.9 7.5 12.6 3.6 1.2 6.4-.2 6.7-5.2C24.2 13.1 23.6 8.7 20.2 7zM24 28c-.6 0-1-.4-1-1v-3c0-7.8 5.8-9 5.8-9 .5-.1 1.1.3 1.2.8.1.5-.3 1.1-.8 1.2C29 17 25 17.9 25 24v3C25 27.6 24.6 28 24 28z"/><path fill="#8bc34a" d="M30.2,8.3C34.6,6.9,40.6,11,42,12c-2.6,1-4.3,9.3-8.9,9.9c-3.2,0.4-4.9-1.3-4.1-5.9 C25.4,13.2,27.1,9.2,30.2,8.3z"/><path fill="#689f38" d="M13.5 20.6C8.4 18.9 8.8 9.7 6 8c2.5.2 6.1 2.4 14.2 7.4C19.9 20.4 17.2 21.8 13.5 20.6zM33.2 21.9c4.5-.6 6.2-8.9 8.9-9.9-2.1-.3-5.4.9-13 4C27.4 20.5 29.9 22.4 33.2 21.9z"/><path fill="#e64a19" d="M13,27l3,15h16l3-15H13z"/><path fill="#bf360c" d="M35,30H13c-0.6,0-1-0.5-1-1v-4h24v4C36,29.5,35.5,30,35,30z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/post.svg b/app/assets/images/icons/post.svg
index 2e8615513..7198c4607 100644
--- a/app/assets/images/icons/post.svg
+++ b/app/assets/images/icons/post.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="96px" height="96px">
-<g id="surface1">
-<path style=" " d="M 2 5 L 2 21 L 6 21 L 6 26.09375 L 7.625 24.78125 L 12.34375 21 L 22 21 L 22 5 Z M 4 7 L 20 7 L 20 19 L 11.65625 19 L 11.375 19.21875 L 8 21.90625 L 8 19 L 4 19 Z M 24 9 L 24 11 L 28 11 L 28 23 L 24 23 L 24 25.90625 L 20.34375 23 L 12.84375 23 L 10.34375 25 L 19.65625 25 L 26 30.09375 L 26 25 L 30 25 L 30 9 Z "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#1565C0" d="M20,36h16l6,6V20c0-2.209-1.791-4-4-4H20c-2.209,0-4,1.791-4,4v12C16,34.209,17.791,36,20,36"/><path fill="#2196F3" d="M29,26H12l-6,6V10c0-2.209,1.791-4,4-4h19c2.209,0,4,1.791,4,4v12C33,24.209,31.209,26,29,26"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/rabbit.svg b/app/assets/images/icons/rabbit.svg
new file mode 100644
index 000000000..ed73bb996
--- /dev/null
+++ b/app/assets/images/icons/rabbit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#546E7A" d="M13,32.827c-1.344-0.115-2.891-0.246-3-0.246c-0.87,0-1.694-0.174-2.44-0.479c-0.641-0.262-1.222-0.624-1.721-1.064c-0.323,0.695-0.434,1.492-0.238,2.293c1.009,4.12,4.382,5.409,7.399,5.628V32.827z"/><path fill="#CFD8DC" d="M35,31.002C31.78,36.152,26.075,41,20,41S9,36.075,9,30s4.925-11,11-11c0.7,0,4.159,0.002,6,0.002c0.918,0,2-1,2-2.002C42.667,16.752,39,24.002,35,31.002z"/><path fill="#78909C" d="M31,13c-5.524-2.763-15.654-2.004-15.749-2.014c-1.374-0.137-2.376-1.361-2.239-2.736c0.138-1.373,1.365-2.373,2.736-2.238c0.427,0.042,10.511-0.389,16.869,4.251c2.383,1.739,1.736,2.119,1.118,3.354C33.297,14.493,31.359,13.18,31,13z"/><path fill="#78909C" d="M44,20c0,3.313-6.687,3-10,3s-6-2.687-6-6s2.687-6,6-6S44,14,44,20z"/><path fill="#B0BEC5" d="M30.553,12.094C23.485,8.744,13.875,9.95,13.449,9.96c-1.377,0.029-2.477,1.17-2.449,2.55c0.028,1.381,1.17,2.478,2.551,2.449c0.09-0.002,8.996-1.756,14.882-0.191C28.869,13.684,29.61,12.757,30.553,12.094z"/><path fill="#90A4AE" d="M37 39V27.286c-.589 1.218-1.288 2.471-2 3.716-.827 1.323-1.82 2.625-2.94 3.831L33 40.005c0 0 0 1.995 2 1.995 1.115 0 4 0 4 0v-1C39 41 39 39 37 39zM25 32.5C25 41 15 39 12 39c0 0 0-1 0-6.5 0-3.59 2.91-6.5 6.5-6.5S25 28.91 25 32.5z"/><path fill="#90A4AE" d="M27,39H14h-2v3h17v-1C29,39.896,28.104,39,27,39z"/><path fill="#455A64" d="M40,17c0,0-1.594,0-2.422,0c-2,0-2.578-3-2.578-3s1.625,0,2.453,0C39.453,14,40,17,40,17z"/><path d="M37.5 14A1.5 1.5 0 1 0 37.5 17A1.5 1.5 0 1 0 37.5 14Z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/seed-add.svg b/app/assets/images/icons/seed-add.svg
new file mode 100644
index 000000000..9040d3628
--- /dev/null
+++ b/app/assets/images/icons/seed-add.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1">
+<g id="surface1048733">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(87.843137%,67.45098%,43.137255%);fill-opacity:1;" d="M 36 20 L 16 6 L 4 23 L 25 37 L 31 37 L 38.070312 25.394531 Z M 36 20 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(36.470588%,25.098039%,21.568627%);fill-opacity:1;" d="M 36.484375 35.726562 C 37.742188 36.925781 39.226562 37.355469 39.78125 36.679688 C 40.34375 36 39.773438 34.476562 38.515625 33.273438 C 37.253906 32.074219 35.777344 31.644531 35.214844 32.320312 C 34.652344 32.996094 35.226562 34.523438 36.484375 35.726562 Z M 30.359375 38.433594 C 31.976562 39.203125 33.578125 39.183594 33.929688 38.390625 C 34.285156 37.597656 33.257812 36.328125 31.640625 35.5625 C 30.023438 34.796875 28.421875 34.8125 28.070312 35.605469 C 27.714844 36.398438 28.742188 37.664062 30.359375 38.433594 Z M 29.484375 31.726562 C 30.742188 32.925781 32.226562 33.355469 32.78125 32.679688 C 33.34375 32 32.773438 30.476562 31.515625 29.273438 C 30.253906 28.074219 28.777344 27.644531 28.214844 28.320312 C 27.652344 28.996094 28.226562 30.523438 29.484375 31.726562 Z M 40 40 C 38.34375 40 37 40.671875 37 41.5 C 37 42.328125 38.34375 43 40 43 C 41.65625 43 43 42.328125 43 41.5 C 43 40.671875 41.65625 40 40 40 Z M 40 40 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,80%,50.196078%);fill-opacity:1;" d="M 16 6 L 18.214844 11.652344 L 10 23 L 4 23 L 25 37 L 36 20 Z M 16 6 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(33.333333%,54.509804%,18.431373%);fill-opacity:1;" d="M 28 23 C 28 26.316406 25.316406 29 22 29 C 18.683594 29 16 26.316406 16 23 C 16 19.683594 18.683594 17 22 17 C 25.316406 17 28 19.683594 28 23 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.535156 19.941406 C 20.535156 19.113281 21.191406 18.445312 22 18.445312 C 22.808594 18.445312 23.464844 19.113281 23.464844 19.941406 C 23.464844 20.773438 22 22.945312 22 22.945312 C 22 22.945312 20.535156 20.773438 20.535156 19.941406 M 23.464844 25.945312 C 23.464844 26.777344 22.808594 27.445312 22 27.445312 C 21.191406 27.445312 20.535156 26.777344 20.535156 25.945312 C 20.535156 25.113281 22 22.945312 22 22.945312 C 22 22.945312 23.464844 25.113281 23.464844 25.945312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.730469 22.742188 C 18.03125 22.328125 17.792969 21.414062 18.195312 20.695312 C 18.597656 19.976562 19.496094 19.730469 20.195312 20.148438 C 20.894531 20.5625 22 22.945312 22 22.945312 C 22 22.945312 19.433594 23.15625 18.730469 22.742188 M 25.269531 23.144531 C 25.96875 23.5625 26.207031 24.476562 25.804688 25.195312 C 25.402344 25.914062 24.503906 26.160156 23.804688 25.742188 C 23.101562 25.328125 22 22.945312 22 22.945312 C 22 22.945312 24.566406 22.730469 25.269531 23.144531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.269531 22.742188 C 25.96875 22.328125 26.207031 21.414062 25.804688 20.695312 C 25.402344 19.976562 24.503906 19.730469 23.804688 20.148438 C 23.101562 20.5625 22 22.945312 22 22.945312 C 22 22.945312 24.566406 23.15625 25.269531 22.742188 M 18.730469 23.144531 C 18.03125 23.5625 17.792969 24.476562 18.195312 25.195312 C 18.597656 25.914062 19.496094 26.160156 20.195312 25.742188 C 20.894531 25.328125 22 22.945312 22 22.945312 C 22 22.945312 19.433594 22.730469 18.730469 23.144531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,75.686275%,2.745098%);fill-opacity:1;" d="M 23.5 23 C 23.5 23.828125 22.828125 24.5 22 24.5 C 21.171875 24.5 20.5 23.828125 20.5 23 C 20.5 22.171875 21.171875 21.5 22 21.5 C 22.828125 21.5 23.5 22.171875 23.5 23 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(26.27451%,62.745098%,27.843137%);fill-opacity:1;" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36 "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/seeds-colour.svg b/app/assets/images/icons/seeds-colour.svg
deleted file mode 100644
index b2bc3e95b..000000000
--- a/app/assets/images/icons/seeds-colour.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" fill:#E0AC6E;" d="M 36 20 L 16 6 L 4 23 L 25 37 L 31 37 L 38.070313 25.394531 Z "/>
-<path style=" fill:#5D4037;" d="M 36.484375 35.726563 C 37.742188 36.925781 39.226563 37.355469 39.78125 36.679688 C 40.34375 36 39.773438 34.476563 38.515625 33.273438 C 37.253906 32.074219 35.777344 31.644531 35.214844 32.320313 C 34.652344 32.996094 35.226563 34.523438 36.484375 35.726563 Z "/>
-<path style=" fill:#5D4037;" d="M 30.359375 38.433594 C 31.976563 39.203125 33.578125 39.183594 33.929688 38.390625 C 34.285156 37.597656 33.257813 36.328125 31.640625 35.5625 C 30.023438 34.796875 28.421875 34.8125 28.070313 35.605469 C 27.714844 36.398438 28.742188 37.664063 30.359375 38.433594 Z "/>
-<path style=" fill:#5D4037;" d="M 29.484375 31.726563 C 30.742188 32.925781 32.226563 33.355469 32.78125 32.679688 C 33.34375 32 32.773438 30.476563 31.515625 29.273438 C 30.253906 28.074219 28.777344 27.644531 28.214844 28.320313 C 27.652344 28.996094 28.226563 30.523438 29.484375 31.726563 Z "/>
-<path style=" fill:#5D4037;" d="M 43 41.5 C 43 40.671875 41.65625 40 40 40 C 38.34375 40 37 40.671875 37 41.5 C 37 42.328125 38.34375 43 40 43 C 41.65625 43 43 42.328125 43 41.5 Z "/>
-<path style=" fill:#FFCC80;" d="M 16 6 L 18.214844 11.652344 L 10 23 L 4 23 L 25 37 L 36 20 Z "/>
-<path style=" fill:#558B2F;" d="M 28 23 C 28 26.316406 25.316406 29 22 29 C 18.683594 29 16 26.316406 16 23 C 16 19.683594 18.683594 17 22 17 C 25.316406 17 28 19.683594 28 23 "/>
-<path style=" fill:#FFFFFF;" d="M 20.535156 19.941406 C 20.535156 19.113281 21.191406 18.445313 22 18.445313 C 22.808594 18.445313 23.464844 19.113281 23.464844 19.941406 C 23.464844 20.773438 22 22.945313 22 22.945313 C 22 22.945313 20.535156 20.773438 20.535156 19.941406 "/>
-<path style=" fill:#FFFFFF;" d="M 23.464844 25.945313 C 23.464844 26.777344 22.808594 27.445313 22 27.445313 C 21.191406 27.445313 20.535156 26.777344 20.535156 25.945313 C 20.535156 25.113281 22 22.945313 22 22.945313 C 22 22.945313 23.464844 25.113281 23.464844 25.945313 "/>
-<path style=" fill:#FFFFFF;" d="M 18.730469 22.742188 C 18.03125 22.328125 17.792969 21.414063 18.195313 20.695313 C 18.597656 19.976563 19.496094 19.730469 20.195313 20.148438 C 20.894531 20.5625 22 22.945313 22 22.945313 C 22 22.945313 19.433594 23.15625 18.730469 22.742188 "/>
-<path style=" fill:#FFFFFF;" d="M 25.269531 23.144531 C 25.96875 23.5625 26.207031 24.476563 25.804688 25.195313 C 25.402344 25.914063 24.503906 26.160156 23.804688 25.742188 C 23.101563 25.328125 22 22.945313 22 22.945313 C 22 22.945313 24.566406 22.730469 25.269531 23.144531 "/>
-<path style=" fill:#FFFFFF;" d="M 25.269531 22.742188 C 25.96875 22.328125 26.207031 21.414063 25.804688 20.695313 C 25.402344 19.976563 24.503906 19.730469 23.804688 20.148438 C 23.101563 20.5625 22 22.945313 22 22.945313 C 22 22.945313 24.566406 23.15625 25.269531 22.742188 "/>
-<path style=" fill:#FFFFFF;" d="M 18.730469 23.144531 C 18.03125 23.5625 17.792969 24.476563 18.195313 25.195313 C 18.597656 25.914063 19.496094 26.160156 20.195313 25.742188 C 20.894531 25.328125 22 22.945313 22 22.945313 C 22 22.945313 19.433594 22.730469 18.730469 23.144531 "/>
-<path style=" fill:#FFC107;" d="M 23.5 23 C 23.5 23.828125 22.828125 24.5 22 24.5 C 21.171875 24.5 20.5 23.828125 20.5 23 C 20.5 22.171875 21.171875 21.5 22 21.5 C 22.828125 21.5 23.5 22.171875 23.5 23 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/seeds.svg b/app/assets/images/icons/seeds.svg
index e546336af..b2bc3e95b 100644
--- a/app/assets/images/icons/seeds.svg
+++ b/app/assets/images/icons/seeds.svg
@@ -1,5 +1,18 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="100" height="100" fill="000000">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="100" height="100" fill="000000">
 <g id="surface1">
-<path style=" " d="M 10.84375 2 L 10.28125 2.8125 L 2.53125 14.46875 L 1.96875 15.3125 L 2.8125 15.84375 L 8.84375 19.875 L 13.5 22.9375 L 15.03125 22.25 C 15.148438 21.535156 15.746094 21 16.5 21 C 16.777344 21 17.265625 21.195313 17.5 21.375 L 19.09375 20.5625 C 19.09375 19.667969 19.691406 19 20.5 19 C 20.832031 19 21.117188 19.121094 21.375 19.3125 L 22.8125 19.0625 L 24.46875 16.59375 L 26.5 13.5625 L 27.03125 12.71875 L 26.21875 12.15625 L 11.6875 2.53125 Z M 11.40625 4.78125 L 24.25 13.28125 L 22.8125 15.46875 L 21.5625 17.34375 C 21.207031 17.21875 20.898438 17 20.5 17 C 19 17 17.820313 18.003906 17.34375 19.3125 C 17.046875 19.230469 16.828125 19 16.5 19 C 15.285156 19 14.375 19.738281 13.75 20.6875 L 9.96875 18.1875 L 4.75 14.75 Z M 13.9375 9 C 13.242188 9.007813 12.566406 9.378906 12.21875 10.125 L 12.03125 10.53125 L 11.625 10.59375 C 10.03125 10.855469 9.421875 12.863281 10.59375 14 L 10.90625 14.28125 L 10.84375 14.6875 C 10.59375 16.316406 12.269531 17.539063 13.6875 16.75 L 14.0625 16.5625 L 14.40625 16.75 C 15.84375 17.496094 17.515625 16.214844 17.21875 14.59375 L 17.125 14.1875 L 17.4375 13.90625 C 18.578125 12.738281 17.910156 10.746094 16.3125 10.53125 L 15.90625 10.46875 L 15.71875 10.09375 C 15.351563 9.359375 14.632813 8.992188 13.9375 9 Z M 14 12 C 14.550781 12 15 12.449219 15 13 C 14.996094 13.554688 14.550781 14 14 14 C 13.449219 14 13 13.554688 13 13 C 13 12.449219 13.445313 11.996094 14 12 Z M 22.1875 21.78125 C 22.039063 21.777344 21.925781 21.820313 21.84375 21.90625 C 21.515625 22.242188 21.9375 23.179688 22.78125 24 C 23.625 24.820313 24.546875 25.210938 24.875 24.875 C 25.203125 24.539063 24.8125 23.601563 23.96875 22.78125 C 23.335938 22.167969 22.632813 21.789063 22.1875 21.78125 Z M 27.25 22.9375 C 26.855469 23.078125 26.445313 23.859375 26.3125 24.84375 C 26.160156 25.96875 26.425781 26.9375 26.875 27 C 27.324219 27.0625 27.816406 26.1875 27.96875 25.0625 C 28.121094 23.9375 27.855469 23 27.40625 22.9375 C 27.351563 22.929688 27.304688 22.917969 27.25 22.9375 Z M 22.09375 26 C 21.703125 26.003906 21.402344 26.125 21.3125 26.34375 C 21.132813 26.777344 21.804688 27.457031 22.8125 27.875 C 23.820313 28.292969 24.789063 28.277344 24.96875 27.84375 C 25.148438 27.410156 24.476563 26.730469 23.46875 26.3125 C 22.964844 26.105469 22.484375 25.996094 22.09375 26 Z M 27.875 28.3125 C 26.699219 28.3125 25.75 28.6875 25.75 29.15625 C 25.75 29.625 26.699219 30 27.875 30 C 29.050781 30 30 29.625 30 29.15625 C 30 28.6875 29.050781 28.3125 27.875 28.3125 Z "/>
+<path style=" fill:#E0AC6E;" d="M 36 20 L 16 6 L 4 23 L 25 37 L 31 37 L 38.070313 25.394531 Z "/>
+<path style=" fill:#5D4037;" d="M 36.484375 35.726563 C 37.742188 36.925781 39.226563 37.355469 39.78125 36.679688 C 40.34375 36 39.773438 34.476563 38.515625 33.273438 C 37.253906 32.074219 35.777344 31.644531 35.214844 32.320313 C 34.652344 32.996094 35.226563 34.523438 36.484375 35.726563 Z "/>
+<path style=" fill:#5D4037;" d="M 30.359375 38.433594 C 31.976563 39.203125 33.578125 39.183594 33.929688 38.390625 C 34.285156 37.597656 33.257813 36.328125 31.640625 35.5625 C 30.023438 34.796875 28.421875 34.8125 28.070313 35.605469 C 27.714844 36.398438 28.742188 37.664063 30.359375 38.433594 Z "/>
+<path style=" fill:#5D4037;" d="M 29.484375 31.726563 C 30.742188 32.925781 32.226563 33.355469 32.78125 32.679688 C 33.34375 32 32.773438 30.476563 31.515625 29.273438 C 30.253906 28.074219 28.777344 27.644531 28.214844 28.320313 C 27.652344 28.996094 28.226563 30.523438 29.484375 31.726563 Z "/>
+<path style=" fill:#5D4037;" d="M 43 41.5 C 43 40.671875 41.65625 40 40 40 C 38.34375 40 37 40.671875 37 41.5 C 37 42.328125 38.34375 43 40 43 C 41.65625 43 43 42.328125 43 41.5 Z "/>
+<path style=" fill:#FFCC80;" d="M 16 6 L 18.214844 11.652344 L 10 23 L 4 23 L 25 37 L 36 20 Z "/>
+<path style=" fill:#558B2F;" d="M 28 23 C 28 26.316406 25.316406 29 22 29 C 18.683594 29 16 26.316406 16 23 C 16 19.683594 18.683594 17 22 17 C 25.316406 17 28 19.683594 28 23 "/>
+<path style=" fill:#FFFFFF;" d="M 20.535156 19.941406 C 20.535156 19.113281 21.191406 18.445313 22 18.445313 C 22.808594 18.445313 23.464844 19.113281 23.464844 19.941406 C 23.464844 20.773438 22 22.945313 22 22.945313 C 22 22.945313 20.535156 20.773438 20.535156 19.941406 "/>
+<path style=" fill:#FFFFFF;" d="M 23.464844 25.945313 C 23.464844 26.777344 22.808594 27.445313 22 27.445313 C 21.191406 27.445313 20.535156 26.777344 20.535156 25.945313 C 20.535156 25.113281 22 22.945313 22 22.945313 C 22 22.945313 23.464844 25.113281 23.464844 25.945313 "/>
+<path style=" fill:#FFFFFF;" d="M 18.730469 22.742188 C 18.03125 22.328125 17.792969 21.414063 18.195313 20.695313 C 18.597656 19.976563 19.496094 19.730469 20.195313 20.148438 C 20.894531 20.5625 22 22.945313 22 22.945313 C 22 22.945313 19.433594 23.15625 18.730469 22.742188 "/>
+<path style=" fill:#FFFFFF;" d="M 25.269531 23.144531 C 25.96875 23.5625 26.207031 24.476563 25.804688 25.195313 C 25.402344 25.914063 24.503906 26.160156 23.804688 25.742188 C 23.101563 25.328125 22 22.945313 22 22.945313 C 22 22.945313 24.566406 22.730469 25.269531 23.144531 "/>
+<path style=" fill:#FFFFFF;" d="M 25.269531 22.742188 C 25.96875 22.328125 26.207031 21.414063 25.804688 20.695313 C 25.402344 19.976563 24.503906 19.730469 23.804688 20.148438 C 23.101563 20.5625 22 22.945313 22 22.945313 C 22 22.945313 24.566406 23.15625 25.269531 22.742188 "/>
+<path style=" fill:#FFFFFF;" d="M 18.730469 23.144531 C 18.03125 23.5625 17.792969 24.476563 18.195313 25.195313 C 18.597656 25.914063 19.496094 26.160156 20.195313 25.742188 C 20.894531 25.328125 22 22.945313 22 22.945313 C 22 22.945313 19.433594 22.730469 18.730469 23.144531 "/>
+<path style=" fill:#FFC107;" d="M 23.5 23 C 23.5 23.828125 22.828125 24.5 22 24.5 C 21.171875 24.5 20.5 23.828125 20.5 23 C 20.5 22.171875 21.171875 21.5 22 21.5 C 22.828125 21.5 23.5 22.171875 23.5 23 "/>
 </g>
 </svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/slug-eating.svg b/app/assets/images/icons/slug-eating.svg
new file mode 100644
index 000000000..37779e14d
--- /dev/null
+++ b/app/assets/images/icons/slug-eating.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M20.6 8H28.400000000000002V10H20.6z" transform="rotate(-50.193 24.499 9.004)"/><path fill="#795548" d="M15.5 5.2H17.5V13.8H15.5z" transform="rotate(-35.537 16.501 9.504)"/><path fill="#795548" d="M24,13.9L24,13.9c-0.3-1.6-1.7-2.9-3.5-2.9c-1.9,0-3.5,1.6-3.5,3.5c0,0.2,0,0.4,0.1,0.6v0 c0,0,0,0.1,0,0.1C19,29,17,32.9,12.7,34c-7.7,2-7,5-7,5s0,2,2,2s6.3,0,6.3,0s12,0,12-12C26,22,25,20.9,24,13.9z"/><path fill="#bcaaa4" d="M24,14.3c-0.3-0.7-1-1.3-2-1.3c-1.1,0-2,0.9-2,2c0,0.3,3.5,13,1,18c-3,6-8,6-10,6 c-1.5,0,0.4,0-5.3,0v0c0,0,0,2,2,2s6.3,0,6.3,0s13,1,13-10C27,24.1,25,22,24,14.3z"/><path fill="#8bc34a" d="M31,41c-0.3,0-0.6-0.1-0.8-0.4c-0.3-0.4-0.2-1.1,0.2-1.4c0.3-0.2,6.4-4.9,5.1-13 c-0.1-0.5,0.3-1.1,0.8-1.1c0.6-0.1,1.1,0.3,1.1,0.8c1.4,9.4-5.6,14.7-5.9,15C31.4,40.9,31.2,41,31,41z"/><path fill="#8bc34a" d="M37.1,17c-0.3,0.9-1.2,1.9-2.4,2.9c0.2,0.3,0.4,0.7,0.4,1.1c0,1.1-0.9,2-2,2c-0.2,0-0.4,0-0.6-0.1 c0.4,0.4,0.6,1,0.6,1.6c0,1.4-1.1,2.5-2.5,2.5c-0.8,0-1.5-0.4-1.9-0.9c-0.3,0.7-0.5,1.3-0.6,2.1c-0.2,3.6,2,5.9,6.9,4.6 c2.9,2.7,7.2,0.8,7.9-2.8C43.9,24.9,38.3,18.5,37.1,17z"/><path fill="#689f38" d="M37.1,17C37.1,17,37.1,17,37.1,17c-0.3,0.9-1.2,1.9-2.4,2.9c0.2,0.3,0.4,0.7,0.4,1.1 c0,1.1-0.9,2-2,2c-0.2,0-0.4,0-0.6-0.1c0.4,0.4,0.6,1,0.6,1.6c0,1.4-1.1,2.5-2.5,2.5c-0.8,0-1.5-0.4-1.9-0.9 c-0.3,0.7-0.5,1.3-0.6,2.1c-0.2,3.6,2,5.9,6.9,4.6c0,0,0,0,0,0C37.7,24,37.5,19.3,37.1,17z"/><path fill="#5d4037" d="M28 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S28 5.9 28 7zM17 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S17 5.9 17 7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/slug.svg b/app/assets/images/icons/slug.svg
new file mode 100644
index 000000000..fd1c93e6e
--- /dev/null
+++ b/app/assets/images/icons/slug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M34.6 8H42.4V10H34.6z" transform="rotate(-50.208 38.5 9.003)"/><path fill="#795548" d="M29.5 5.2H31.5V13.8H29.5z" transform="rotate(-35.537 30.502 9.504)"/><path fill="#795548" d="M38,13.9L38,13.9c-0.3-1.6-1.7-2.9-3.5-2.9c-1.9,0-3.5,1.6-3.5,3.5c0,0.2,0,0.4,0.1,0.6v0 c0,0,0,0.1,0,0.1C34,30.1,27,31,19,32C7.9,33.4,6,39,6,39s0,2,2,2s20,0,20,0s12,0,12-12C40,22,39,20.9,38,13.9z"/><path fill="#bcaaa4" d="M38,14.3c-0.3-0.7-1-1.3-2-1.3c-1.1,0-2,0.9-2,2c0,0.3,2.5,13,0,18c-3,6-7,6-9,6c-1.5,0-13.3,0-19,0 v0c0,0,0,2,2,2s20,0,20,0s13,1,13-11C41,23.1,39,22,38,14.3z"/><path fill="#5d4037" d="M42 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S42 5.9 42 7zM31 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S31 5.9 31 7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/snail.svg b/app/assets/images/icons/snail.svg
new file mode 100644
index 000000000..bdeee93f0
--- /dev/null
+++ b/app/assets/images/icons/snail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M38,13.9L38,13.9c-0.3-1.6-1.7-2.9-3.5-2.9c-1.9,0-3.5,1.6-3.5,3.5c0,0.2,0,0.4,0.1,0.6v0 c0,0,0,0.1,0,0.1C34,30.1,27,31,19,32C7.9,33.4,6,39,6,39s0,2,2,2s20,0,20,0s12,0,12-12C40,22,39,20.9,38,13.9z"/><path fill="#795548" d="M34.6 8H42.4V10H34.6z" transform="rotate(-50.208 38.5 8.98)"/><path fill="#795548" d="M29.5 5.2H31.5V13.8H29.5z" transform="rotate(-35.537 30.502 9.481)"/><path fill="#5d4037" d="M42 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2S42 5.9 42 7zM31 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2S31 5.9 31 7z"/><path fill="#bcaaa4" d="M38,14.2c-0.3-0.7-1-1.3-2-1.3c-1.1,0-2,0.9-2,2c0,0.3,2.5,13,0,18c-3,6-7,6-9,6c-1.5,0-13.3,0-19,0 c0,0,0,2,2,2s20,0,20,0s13,1,13-11C41,23.1,39,22,38,14.2z"/><path fill="#4e342e" d="M31.8,19.9C31.7,19.9,31.7,19.9,31.8,19.9C32.4,30.3,26,31.1,19,32c-2.5,0.3-4.6,0.9-6.3,1.5 c-0.4,0.3-0.7,0.4-0.9,0.4c0,0,0,0,0,0c-0.4,0.2-0.7,0.3-1,0.5c0,0,0,0,0,0c-0.3,0.2-0.6,0.3-0.9,0.5c0,0,0,0,0,0 c1.8,1.4,4,2.4,6.3,2.8c0.3,0.1,0.6,0.1,1,0.2c0.1,0,0.2,0,0.3,0c0.6,0.1,1.4,0.1,2.2,0.1c0.7,0,1.3,0,1.9-0.1l0.4-0.1l0.4-0.2 c1.2-0.7,2.2-1.5,3.1-2.4c0.8-0.8,1.5-1.7,2-2.6c3-0.7,6.3-2.5,6.4-6.1C34,26.3,34.3,23.4,31.8,19.9z"/><path fill="#ff9800" d="M6,23c0-3.3,1.3-6.4,3.3-8.7c2.4-2.7,5.8-4.3,9.7-4.3c7.2,0,13,5.8,13,13c0,0.1,0.2,1.9-0.2,3.4 C30.7,31.5,25,31,25,31s-3.1,5-6,5C11.8,36,6,30.2,6,23z"/><path fill="#ffb74d" d="M17.4 16c.2 0 .4 0 .6 0 .5 0 1 .1 1.5.1.6-1.3 1.3-3.5 1.1-6C20.1 10.1 19.6 10 19 10c-.1 0-.2 0-.3 0C18.8 12.7 17.8 15.1 17.4 16zM14.5 16.8c.7-.3 1.4-.6 2.1-.7.2-1.7.1-3.8-.7-5.8-.7.2-1.3.4-1.9.6C14.8 13 14.7 15.3 14.5 16.8zM22.6 17.5c.8-1.3 2-3.5 2.4-6-.6-.3-1.2-.6-1.9-.8-.3 2.4-1.5 4.7-2.3 5.8C21.5 16.8 22.1 17.1 22.6 17.5zM9.4 23.8l.6.4c0-.1 0-.1 0-.2 0-.7.1-1.4.3-2-.6-.3-2.1-1-4.1-.9C6.1 21.7 6 22.4 6 23c0 0 0 .1 0 .1C8 22.9 9.4 23.8 9.4 23.8zM10.2 19.6l.6.8.2-.1c.7-1.3 1.7-2.4 3-3.1-.3-1.5-1.1-3.2-2.5-4.7-.5.4-1 .8-1.5 1.3C11.3 15.2 12 17 12 18v.7l-.2-.3c-.1-.1-1.2-1.8-3.5-2.8-.4.6-.7 1.1-1 1.7C9.1 18.1 10.1 19.5 10.2 19.6zM10.1 24.9l-.4.1c-.1 0-1.7.6-3 2 .2.7.5 1.4.9 2.1 1.1-1.6 2.7-2.2 2.8-2.2l.2-.1C10.3 26.3 10.1 25.6 10.1 24.9zM25.7 22.1l.7 1.9c1.5-.5 3.8-2.1 5-5-.3-1-.8-2-1.3-2.8C29.6 20.6 25.9 22 25.7 22.1zM24.4 19.9c.2-.1 3.1-1.6 4.1-5.6-.5-.6-1.1-1.1-1.7-1.6-.6 3.9-3.2 5.4-3.3 5.4l-.9.4L24.4 19.9zM26.2 29c1.5-.3 4-1.3 5.8-3.4.2-1.3 0-2.5 0-2.6 0-.5 0-1.1-.1-1.6C30.8 26.1 26 27 25.8 27l-.7 2.1L26.2 29z"/><path fill="#ce630b" d="M24.1,17.7C22.3,16,20,15,17.5,15c-2.5,0-4.8,1-6.6,2.7c-3,3-3,7.8,0,10.8c2.5,2.5,6.5,2.5,8.9,0 c1-1,1.5-2.3,1.5-3.7s-0.5-2.7-1.5-3.7c-0.8-0.8-1.9-1.3-3.1-1.3c-1.2,0-2.3,0.5-3.1,1.3c-1.5,1.5-1.5,3.8,0,5.3 c1.2,1.2,3.3,1.2,4.5,0c0.4-0.4,0.4-1,0-1.4s-1-0.4-1.4,0c-0.5,0.5-1.2,0.5-1.7,0c-0.7-0.7-0.7-1.8,0-2.4c0.9-0.9,2.5-0.9,3.4,0 c0.6,0.6,1,1.4,1,2.3c0,0.9-0.3,1.7-1,2.3c-1.7,1.7-4.4,1.7-6.1,0c-2.2-2.2-2.2-5.8,0-8c1.4-1.4,3.2-2.1,5.2-2.1 c2,0,3.8,0.8,5.2,2.1c3.7,3.7,3.7,9.6,0,13.3c-1.7,1.7-3.9,2.9-6.2,3.3c1.1,0.2,3,0.5,4.9,0.2c1-0.6,1.9-1.3,2.7-2.1 C28.5,29.4,28.5,22.2,24.1,17.7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/spiderweb.svg b/app/assets/images/icons/spiderweb.svg
new file mode 100644
index 000000000..634bf37ee
--- /dev/null
+++ b/app/assets/images/icons/spiderweb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#c5cae9" d="M20.5,31.1l0.1-2.1c0,0,0-1-0.7-1.7c-0.7-0.7-1.9-0.8-1.9-0.8l-2-0.1l1.2-1.5 c0.2-0.3,0.8-1.1,0.8-1.9s-0.6-1.6-0.8-1.9l-1.1-1.4l1.8-0.2c0.3,0,1.4-0.3,1.9-0.8c0.5-0.5,0.7-1.5,0.7-1.8l0.1-1.7l1.4,1 c0.5,0.3,1.4,0.8,1.9,0.8c0.5,0,1.4-0.5,1.9-0.8l1.3-0.9l0.3,1.5c0.1,0.4,0.4,1.4,0.9,2c0.6,0.6,1.7,0.7,1.7,0.7l1.9,0.1l-1.2,1.5 C30.6,21.4,30,22.3,30,23c0,0.7,0.5,1.5,0.8,1.9l1.2,1.6l-2,0.1c0,0-1.2,0.1-1.8,0.7c-0.7,0.7-0.7,1.8-0.7,1.8l-0.1,2l-1.5-1.2 C25.6,29.6,24.7,29,24,29s-1.6,0.6-1.9,0.8L20.5,31.1z M24,27c0.6,0,1.3,0.2,1.8,0.4c0.2-0.5,0.5-1.1,1-1.6s1.1-0.8,1.6-1 C28.2,24.3,28,23.6,28,23c0-0.7,0.2-1.3,0.5-1.8c-0.5-0.2-1-0.5-1.5-1c-0.5-0.5-0.9-1.1-1.1-1.7C25.3,18.8,24.6,19,24,19 c-0.6,0-1.3-0.2-1.8-0.5c-0.2,0.6-0.5,1.2-1,1.6c-0.5,0.5-1.1,0.8-1.7,1c0.2,0.5,0.4,1.2,0.4,1.8c0,0.7-0.2,1.3-0.4,1.8 c0.6,0.2,1.2,0.5,1.7,1c0.5,0.5,0.8,1,1,1.6C22.8,27.2,23.4,27,24,27z"/><path fill="#c5cae9" d="M29.4,36.1l-0.7-0.3c0,0-2.6-0.9-4.6-0.9c-2,0-4.6,0.9-4.6,0.9l-0.7,0.2l-0.4-0.6c0,0-1.4-2-3-3.6 c-1.6-1.6-3.7-3.1-3.8-3.1l-0.6-0.4l0.2-0.7c0.2-0.9,0.9-3.4,0.9-4.7c0-1.3-0.6-3.8-0.9-4.7l-0.2-0.7l0.7-0.4c0,0,2.5-1.5,3.8-2.8 c1.3-1.3,2.8-3.8,2.8-3.8l0.5-0.7l0.8,0.3c0,0,2,0.8,4.5,0.8c2.6,0,4.5-0.8,4.5-0.8l0.8-0.3l0.5,0.7c0,0,1.4,2.2,3.1,3.9 c1.7,1.7,3.5,2.7,3.5,2.7l0.8,0.4l-0.4,0.8c0,0-0.8,2-0.8,4.5c0,2.6,0.8,4.5,0.8,4.5l0.3,0.7l-0.7,0.5c0,0-2.3,1.6-3.9,3.3 c-1.6,1.6-2.8,3.4-2.8,3.4L29.4,36.1z M13.2,27.5c0.8,0.6,2.2,1.7,3.4,2.9c1.2,1.2,2.2,2.5,2.8,3.3c1-0.3,2.9-0.8,4.6-0.8 c1.7,0,3.5,0.5,4.5,0.8c0.5-0.7,1.5-2,2.6-3.1c1.2-1.2,2.7-2.4,3.6-3C34.4,26.7,34,25,34,23c0-1.9,0.4-3.6,0.7-4.5 c-0.8-0.5-2-1.4-3.2-2.6c-1.3-1.3-2.4-2.8-2.9-3.6C27.6,12.6,26,13,24,13c-1.9,0-3.6-0.4-4.5-0.7c-0.6,0.9-1.7,2.5-2.7,3.5 c-1,1-2.7,2.1-3.6,2.7c0.3,1.1,0.8,3.1,0.8,4.5C14,24.4,13.5,26.5,13.2,27.5z"/><path fill="#c5cae9" d="M32.5,43.5l-1.1-0.6c0,0-3.6-1.9-7.4-1.9c-3.9,0-7.4,1.9-7.4,1.9l-1.1,0.6l-0.3-1.2 c0,0-1-3.9-3.8-6.6c-2.8-2.8-6.6-3.8-6.6-3.8l-1.2-0.3l0.5-1.1c0,0,1.9-4,1.9-7.4c0-3.5-1.3-7.2-1.4-7.3l-0.3-1l1-0.3 c0,0,3.8-1.3,6.6-4.1c2.7-2.7,3.8-5.6,3.8-5.6l0.5-1.3l1.1,0.9c0,0,2.3,1.7,6.8,1.7c4.5,0,6.8-1.9,6.9-1.9l1.2-1l0.4,1.5 c0,0,0.9,3.2,4.1,6.3c2.3,2.2,5.8,3.7,5.9,3.7l1,0.4l-0.4,1c0,0-1,2.3-1,7.1c0,4.7,1.8,7.3,1.8,7.3l0.9,1.2l-1.4,0.4 c0,0-3.7,0.9-6.6,3.8c-2.9,2.9-3.8,6.6-3.8,6.6L32.5,43.5z M6.4,30.3c1.5,0.5,4.2,1.8,6.4,4c2.2,2.2,3.4,4.9,4,6.4 C18.2,40,21,39,24,39c3,0,5.8,1,7.3,1.6c0.5-1.5,1.7-4.1,4-6.4c2.2-2.2,4.8-3.4,6.3-3.9C40.9,28.9,40,26.5,40,23 c0-3.5,0.5-5.8,0.9-7c-1.3-0.6-3.7-1.9-5.6-3.7c-2.4-2.3-3.7-4.6-4.2-6C29.7,7.1,27.4,8,24,8c-3.4,0-5.7-0.9-7-1.5 c-0.6,1.2-1.8,3.3-3.8,5.3C11,14,8.2,15.4,6.8,16C7.3,17.4,8,20.2,8,23C8,25.8,7,28.7,6.4,30.3z"/><path fill="#c5cae9" d="M22.2 24.8L31.3 2.7 33.2 3.5 25.8 21.2 43.5 13.8 44.3 15.7z"/><path fill="#c5cae9" d="M31.8 44.2L22.1 21.1 45.1 30.6 44.3 32.5 25.9 24.9 33.6 43.4z"/><path fill="#c5cae9" d="M16.4 44.2L14.5 43.4 22.2 24.8 3.5 32.6 2.7 30.7 25.8 21.2z"/><path fill="#c5cae9" d="M25.8 24.8L3.7 15.7 4.5 13.8 22.2 21.2 14.8 3.5 16.7 2.7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/sprinkler.svg b/app/assets/images/icons/sprinkler.svg
new file mode 100644
index 000000000..3458f029f
--- /dev/null
+++ b/app/assets/images/icons/sprinkler.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><polygon fill="#546e7a" points="19.78,10 21.181,16 26.819,16 28.22,10"/><polygon fill="#90a4ae" points="21,15 21,41.674 27,41.108 27,15"/><rect width="10" height="2" x="19" y="9" fill="#78909c"/><path fill="#42a5f5" d="M9,14c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,14,9,14z"/><path fill="#42a5f5" d="M9,18c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,18,9,18z"/><path fill="#42a5f5" d="M9,10c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,10,9,10z"/><path fill="#42a5f5" d="M9,6C8.449,6,8,5.551,8,5s0.449-1,1-1s1,0.449,1,1S9.551,6,9,6z"/><path fill="#42a5f5" d="M13,14c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S13.551,14,13,14z"/><path fill="#42a5f5" d="M13,18c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S13.551,18,13,18z"/><path fill="#42a5f5" d="M13,10c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S13.551,10,13,10z"/><path fill="#42a5f5" d="M17,14c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S17.551,14,17,14z"/><path fill="#42a5f5" d="M9,22c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,22,9,22z"/><path fill="#42a5f5" d="M38,13c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,13.551,38,13z"/><path fill="#42a5f5" d="M38,17c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,17.551,38,17z"/><path fill="#42a5f5" d="M38,9c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,9.551,38,9z"/><path fill="#42a5f5" d="M38,5c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,5.551,38,5z"/><path fill="#42a5f5" d="M34,13c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S34,13.551,34,13z"/><path fill="#42a5f5" d="M34,17c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S34,17.551,34,17z"/><path fill="#42a5f5" d="M34,9c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S34,9.551,34,9z"/><path fill="#42a5f5" d="M30,13c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S30,13.551,30,13z"/><path fill="#42a5f5" d="M38,21c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,21.551,38,21z"/><path fill="#388e3c" d="M23.859,44c0-9.376,4.958-17.143,6.141-18.761c-0.581,1.532-2.048,4.392-2.048,18.761H23.859z"/><path fill="#4caf50" d="M20.437,32.952C20.676,33.748,21.841,39.193,22,40c1.638,2.673,0.997,1.129,1,4h2.333	c-0.161-1.963-0.495-3.972-0.991-5.909c-0.501-1.942-1.182-3.847-2.073-5.67c-0.887-1.823-1.983-3.564-3.293-5.165	c-1.315-1.592-2.817-3.085-4.621-4.239c1.585,1.359,2.789,2.988,3.792,4.664C19.142,29.369,19.893,31.144,20.437,32.952z"/><path fill="#388e3c" d="M25.793,44c0-7.57,7.072-16.249,9.029-17.66c-1.086,1.294-4.825,6.761-4.825,17.66H25.793z"/><path fill="#8bc34a" d="M29.018,44c0-7.531,7.237-13.622,8.386-14.373c-0.922,0.949-4.492,6.088-4.492,14.373H29.018z"/><path fill="#8bc34a" d="M16,44c0-8.304-4.005-13.449-5-14.373c1.212,0.718,9,7.052,9,14.373H16z"/><path fill="#8bc34a" d="M31.249,44C33,39,37.687,37.45,39,37c-2,2-3,4-3,7H31.249z"/><path fill="#8bc34a" d="M14.249,44c-0.249-3-2.249-7-4-9c2.751,1,6,4,7.751,9H14.249z"/><path fill="#388e3c" d="M19.16,44c0-9.389-2.633-14.288-3.515-15.464C16.784,29.543,24,37.381,24,44H19.16z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/sprout-add.svg b/app/assets/images/icons/sprout-add.svg
new file mode 100644
index 000000000..e58159cd7
--- /dev/null
+++ b/app/assets/images/icons/sprout-add.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1">
+<g id="surface1026554">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,76.470588%,29.019608%);fill-opacity:1;" d="M 30.800781 18.199219 C 28.398438 18.898438 27.199219 21.601562 28.699219 23.601562 C 27.800781 24.101562 26.601562 25.199219 25.5 26.898438 C 25.398438 22.5 25.800781 18.199219 26.800781 15.101562 C 28.199219 16.5 29.898438 16.300781 31.398438 15 C 34.101562 12.601562 31.699219 6.898438 32.898438 5.101562 C 31.5 5.101562 26 5.601562 23.699219 8.398438 C 22.199219 10.300781 22.800781 13 25.300781 13.5 C 23.898438 16.898438 23.398438 21.800781 23.398438 26.601562 C 22.601562 25.398438 21.5 24.199219 20.101562 23.300781 C 22.898438 21.101562 22.101562 17.601562 19.199219 16.101562 C 14.898438 13.699219 7.800781 16.300781 6 17 C 8.601562 18.601562 8.398438 27 13.199219 28.601562 C 16.300781 29.601562 18.699219 28.601562 19.300781 24.898438 C 23.300781 27.800781 24 33 24.101562 33.101562 C 24.199219 33.601562 24.601562 34 25.101562 34 L 25.199219 34 C 25.699219 33.898438 26.101562 33.5 26.101562 33 C 26.101562 29.101562 27.898438 26.898438 29.199219 25.898438 C 29.300781 28.398438 31 29.398438 33.398438 29.199219 C 37.300781 28.699219 38.800781 22.101562 41.101562 21.199219 C 39.800781 20.199219 34.601562 17.199219 30.800781 18.199219 Z M 30.800781 18.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,62.352941%,21.960784%);fill-opacity:1;" d="M 13.199219 28.601562 C 8.398438 27 8.601562 18.601562 6 17 C 8.300781 17.199219 11.800781 19.101562 19.398438 23.800781 C 19.101562 28.398438 16.601562 29.699219 13.199219 28.601562 Z M 33.300781 29 C 37.199219 28.5 38.699219 21.898438 41 21 C 39.199219 20.800781 35.800781 21.699219 29.199219 24.101562 C 28.601562 27.800781 30.5 29.300781 33.300781 29 Z M 31.5 14.898438 C 34.601562 11.898438 31.800781 6.800781 33 5 C 31.5 5.800781 29.398438 8.199219 25.800781 13.5 C 27.300781 16.5 29.5 16.601562 31.5 14.898438 Z M 31.5 14.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.45098%,33.333333%,28.235294%);fill-opacity:1;" d="M 9 42 L 40.601562 42 C 41.398438 41.300781 42 40.199219 42 39 C 42 36.800781 40.199219 35 38 35 C 37.601562 35 37.199219 35.101562 36.800781 35.199219 C 36.199219 33.300781 34.5 32 32.5 32 C 31.199219 32 30 32.601562 29.199219 33.398438 C 28.101562 32.5 26.601562 32 25 32 C 22.898438 32 21 32.898438 19.699219 34.398438 C 19.199219 34.199219 18.601562 34 18 34 C 16.898438 34 16 34.398438 15.300781 35.101562 C 14.699219 34.398438 13.898438 34 13 34 C 11.601562 34 10.5 34.898438 10.101562 36.199219 C 9.800781 36.101562 9.398438 36 9 36 C 7.300781 36 6 37.300781 6 39 C 6 40.699219 7.300781 42 9 42 Z M 9 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55.294118%,43.137255%,38.823529%);fill-opacity:1;" d="M 38 40 C 38 38.300781 36.699219 37 35 37 C 33.5 37 32.300781 38.101562 32.101562 39.398438 C 31.300781 38.601562 30.199219 38 29 38 C 27.699219 38 26.5 38.699219 25.800781 39.699219 C 25.300781 38.101562 23.800781 37 22 37 C 20.898438 37 20 37.398438 19.300781 38.101562 C 18.699219 37.398438 17.898438 37 17 37 C 15.601562 37 14.5 37.898438 14.101562 39.199219 C 13.800781 39.101562 13.398438 39 13 39 C 11.101562 39 9.601562 40.300781 9.101562 42 L 40 42 C 39.800781 41 39 40.199219 38 40 Z M 38 40 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(26.27451%,62.745098%,27.843137%);fill-opacity:1;" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36 "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/sprout.svg b/app/assets/images/icons/sprout.svg
new file mode 100644
index 000000000..bfebc1bb5
--- /dev/null
+++ b/app/assets/images/icons/sprout.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#8BC34A" d="M30.8,18.2c-2.4,0.7-3.6,3.4-2.1,5.4c-0.9,0.5-2.1,1.6-3.2,3.3c-0.1-4.4,0.3-8.7,1.3-11.8c1.4,1.4,3.1,1.2,4.6-0.1c2.7-2.4,0.3-8.1,1.5-9.9c-1.4,0-6.9,0.5-9.2,3.3c-1.5,1.9-0.9,4.6,1.6,5.1c-1.4,3.4-1.9,8.3-1.9,13.1c-0.8-1.2-1.9-2.4-3.3-3.3c2.8-2.2,2-5.7-0.9-7.2C14.9,13.7,7.8,16.3,6,17c2.6,1.6,2.4,10,7.2,11.6c3.1,1,5.5,0,6.1-3.7c4,2.9,4.7,8.1,4.8,8.2c0.1,0.5,0.5,0.9,1,0.9c0,0,0.1,0,0.1,0c0.5-0.1,0.9-0.5,0.9-1l0,0c0-3.9,1.8-6.1,3.1-7.1c0.1,2.5,1.8,3.5,4.2,3.3c3.9-0.5,5.4-7.1,7.7-8C39.8,20.2,34.6,17.2,30.8,18.2z"/><path fill="#689F38" d="M13.2,28.6C8.4,27,8.6,18.6,6,17c0,0,0,0,0,0c2.3,0.2,5.8,2.1,13.4,6.8c0,0,0,0,0,0C19.1,28.4,16.6,29.7,13.2,28.6z M33.3,29c3.9-0.5,5.4-7.1,7.7-8c0,0,0,0,0,0c-1.8-0.2-5.2,0.7-11.8,3.1c0,0,0,0,0,0C28.6,27.8,30.5,29.3,33.3,29z M31.5,14.9c3.1-3,0.3-8.1,1.5-9.9c0,0,0,0,0,0c-1.5,0.8-3.6,3.2-7.2,8.5c0,0,0,0,0,0C27.3,16.5,29.5,16.6,31.5,14.9z"/><path fill="#795548" d="M9,42h9.7h12.6h4.1h5.2c0.8-0.7,1.4-1.8,1.4-3c0-2.2-1.8-4-4-4c-0.4,0-0.8,0.1-1.2,0.2c-0.6-1.9-2.3-3.2-4.3-3.2c-1.3,0-2.5,0.6-3.3,1.4C28.1,32.5,26.6,32,25,32c-2.1,0-4,0.9-5.3,2.4C19.2,34.2,18.6,34,18,34c-1.1,0-2,0.4-2.7,1.1C14.7,34.4,13.9,34,13,34c-1.4,0-2.5,0.9-2.9,2.2C9.8,36.1,9.4,36,9,36c-1.7,0-3,1.3-3,3S7.3,42,9,42z"/><path fill="#8D6E63" d="M38,40C38,40,38,40,38,40c0-1.7-1.3-3-3-3c-1.5,0-2.7,1.1-2.9,2.4C31.3,38.6,30.2,38,29,38c-1.3,0-2.5,0.7-3.2,1.7c-0.5-1.6-2-2.7-3.8-2.7c-1.1,0-2,0.4-2.7,1.1C18.7,37.4,17.9,37,17,37c-1.4,0-2.5,0.9-2.9,2.2C13.8,39.1,13.4,39,13,39c-1.9,0-3.4,1.3-3.9,3h26h2.1H40C39.8,41,39,40.2,38,40z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/stones.svg b/app/assets/images/icons/stones.svg
new file mode 100644
index 000000000..06585a21b
--- /dev/null
+++ b/app/assets/images/icons/stones.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#607d8b" d="M43,36.333C43,32.651,36.15,28,24,28S5,32.651,5,36.333C5,40.015,11.85,43,24,43S43,40.015,43,36.333z"/><path fill="#d7ccc8" d="M41,23.923C41,20.864,31.864,16,27,16c-8.837,0-16,2.864-16,5.923s7.181,5.617,16,6.177C35.776,28.657,41,26.982,41,23.923z"/><path fill="#607d8b" d="M31,11c0-2.209-4.029-4-9-4s-9,3.791-9,6s4.029,3.192,9,3.192S31,13.209,31,11z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/timeline.svg b/app/assets/images/icons/timeline.svg
new file mode 100644
index 000000000..e1e151dda
--- /dev/null
+++ b/app/assets/images/icons/timeline.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="96px" height="96px">
+<g id="surface1">
+<path style=" fill:#CFD8DC;" d="M 5 38 L 5 14 L 43 14 L 43 38 C 43 40.199219 41.199219 42 39 42 L 9 42 C 6.800781 42 5 40.199219 5 38 Z "/>
+<path style=" fill:#F44336;" d="M 43 10 L 43 16 L 5 16 L 5 10 C 5 7.800781 6.800781 6 9 6 L 39 6 C 41.199219 6 43 7.800781 43 10 Z "/>
+<path style=" fill:#B71C1C;" d="M 36 10 C 36 11.65625 34.65625 13 33 13 C 31.34375 13 30 11.65625 30 10 C 30 8.34375 31.34375 7 33 7 C 34.65625 7 36 8.34375 36 10 Z "/>
+<path style=" fill:#B71C1C;" d="M 18 10 C 18 11.65625 16.65625 13 15 13 C 13.34375 13 12 11.65625 12 10 C 12 8.34375 13.34375 7 15 7 C 16.65625 7 18 8.34375 18 10 Z "/>
+<path style=" fill:#B0BEC5;" d="M 33 3 C 31.898438 3 31 3.898438 31 5 L 31 10 C 31 11.101563 31.898438 12 33 12 C 34.101563 12 35 11.101563 35 10 L 35 5 C 35 3.898438 34.101563 3 33 3 Z "/>
+<path style=" fill:#B0BEC5;" d="M 15 3 C 13.898438 3 13 3.898438 13 5 L 13 10 C 13 11.101563 13.898438 12 15 12 C 16.101563 12 17 11.101563 17 10 L 17 5 C 17 3.898438 16.101563 3 15 3 Z "/>
+<path style=" fill:#90A4AE;" d="M 13 20 L 17 20 L 17 24 L 13 24 Z "/>
+<path style=" fill:#90A4AE;" d="M 19 20 L 23 20 L 23 24 L 19 24 Z "/>
+<path style=" fill:#90A4AE;" d="M 25 20 L 29 20 L 29 24 L 25 24 Z "/>
+<path style=" fill:#90A4AE;" d="M 31 20 L 35 20 L 35 24 L 31 24 Z "/>
+<path style=" fill:#90A4AE;" d="M 13 26 L 17 26 L 17 30 L 13 30 Z "/>
+<path style=" fill:#90A4AE;" d="M 19 26 L 23 26 L 23 30 L 19 30 Z "/>
+<path style=" fill:#90A4AE;" d="M 25 26 L 29 26 L 29 30 L 25 30 Z "/>
+<path style=" fill:#90A4AE;" d="M 31 26 L 35 26 L 35 30 L 31 30 Z "/>
+<path style=" fill:#90A4AE;" d="M 13 32 L 17 32 L 17 36 L 13 36 Z "/>
+<path style=" fill:#90A4AE;" d="M 19 32 L 23 32 L 23 36 L 19 36 Z "/>
+<path style=" fill:#90A4AE;" d="M 25 32 L 29 32 L 29 36 L 25 36 Z "/>
+<path style=" fill:#90A4AE;" d="M 31 32 L 35 32 L 35 36 L 31 36 Z "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/watering-can.svg b/app/assets/images/icons/watering-can.svg
new file mode 100644
index 000000000..3e24501d1
--- /dev/null
+++ b/app/assets/images/icons/watering-can.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#4caf50" d="M13.4 19.2H17.4V39.9H13.4z" transform="rotate(-40.412 15.36 29.55)"/><path fill="#4caf50" d="M20.2 20.2v17.3c0 1.1.9 1.9 1.9 1.9h14.4c1.1 0 1.9-.9 1.9-1.9V22.1h-8.6v-3.8C24 18.2 20.2 20.2 20.2 20.2zM4.9 23.3l5.8-5.1c1.4 1.6 1.2 4-.4 5.4C8.7 25.1 6.3 24.9 4.9 23.3z"/><path fill="#2e7d32" d="M32.2,8.6c-6.5,0-11.7,5.1-12,11.5c0.1-0.1,0.8-0.4,2-0.8c0.6-5,4.9-8.8,10-8.8 c5.6,0,10.1,4.5,10.1,10.1c0,3.2-1.5,6.1-3.8,7.9v2.3c3.4-2.1,5.8-5.9,5.8-10.2C44.2,14,38.8,8.6,32.2,8.6z"/><path fill="#2e7d32" d="M20.2 22.1h18.2V24H20.2V22.1zM11.4 22c-.2.6-.6 1.2-1.1 1.7-.5.5-1.1.7-1.7.9l1.4 1.6c.6-.2 1.2-.6 1.7-1 .5-.4.9-1 1.2-1.5L11.4 22z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/wheelbarrow.svg b/app/assets/images/icons/wheelbarrow.svg
new file mode 100644
index 000000000..97d319f29
--- /dev/null
+++ b/app/assets/images/icons/wheelbarrow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 50 50"><path fill="#795548" d="M43,17c0-1.104-0.896-2-2-2c-0.438,0-0.839,0.145-1.168,0.383C39.936,15.107,40,14.812,40,14.5c0-1.381-1.119-2.5-2.5-2.5c-0.587,0-1.119,0.21-1.546,0.549C35.735,11.108,34.502,10,33,10c-0.921,0-1.734,0.424-2.285,1.078C30.001,10.415,29.052,10,28,10c-2.209,0-4,1.791-4,4c0,0.101,0.022,0.195,0.03,0.293C23.728,14.111,23.378,14,23,14c-1.104,0-2,0.896-2,2c0,0.366,0.105,0.705,0.277,1H43z"/><path fill="#FF5722" d="M19,18l2,9c0,0,7,3,13,3s11-12,11-12H19z"/><path fill="#FF5722" d="M46,19c0,0.553-0.447,1-1,1H19c-0.552,0-1-0.447-1-1v-1c0-0.553,0.448-1,1-1h26c0.553,0,1,0.447,1,1V19z"/><path fill="#37474F" d="M11 18H5c-.552 0-1 .447-1 1s.448 1 1 1h6V18zM39 30.001c-2.762 0-5 2.238-5 5s2.238 5 5 5 5-2.238 5-5S41.762 30.001 39 30.001zM39 38.001c-1.656 0-3-1.343-3-3s1.344-3 3-3 3 1.343 3 3S40.656 38.001 39 38.001z"/><path fill="#BF360C" d="M42.984,22c0.418-0.729,0.78-1.41,1.077-2H19.444l0.444,2H42.984z"/><path fill="#5D4037" d="M36.908,17C36.964,16.843,37,16.676,37,16.5c0-0.828-0.672-1.5-1.5-1.5c-0.18,0-0.35,0.037-0.51,0.095C34.992,15.063,35,15.032,35,15c0-1.104-0.896-2-2-2c-0.755,0-1.404,0.423-1.745,1.041C30.705,13.408,29.904,13,29,13c-1.657,0-3,1.343-3,3c0,0.353,0.072,0.686,0.184,1H36.908z"/><path fill="#9FA8DA" d="M39.703,34.289c-0.033-0.031-3.257-3.217-3.903-3.91c-0.861-0.939-2.28-1.08-3.458-0.35c-0.981,0.621-2.236,1.517-3.343,2.308c-0.705,0.504-1.356,0.969-1.846,1.297c-0.741,0.502-1.013,0.499-1.078,0.48c-0.298-0.063-0.856-0.968-1.126-1.404c-0.726-1.166-3.047-5.929-3.07-5.977c-0.061-0.125-0.147-0.236-0.253-0.326l-9.589-8.108c-0.091-0.077-0.194-0.128-0.3-0.166C11.594,18.056,11.439,18,11.266,18H11v0.153V20v0.042l9.173,7.757c0.452,0.924,2.376,4.841,3.076,5.965c0.722,1.169,1.358,2.081,2.406,2.307c0.156,0.033,0.311,0.049,0.464,0.049c0.811,0,1.563-0.429,2.151-0.826c0.499-0.335,1.167-0.812,1.891-1.329c1.086-0.774,2.315-1.653,3.243-2.239c0.233-0.146,0.674-0.265,0.927,0.012c0.68,0.729,3.832,3.844,3.966,3.977c0.394,0.388,1.025,0.383,1.415-0.009C40.1,35.311,40.096,34.678,39.703,34.289z"/></svg>
\ No newline at end of file
diff --git a/app/assets/javascripts/datepicker.js b/app/assets/javascripts/datepicker.js
new file mode 100644
index 000000000..29778c169
--- /dev/null
+++ b/app/assets/javascripts/datepicker.js
@@ -0,0 +1,3 @@
+$(document).ready(function() {
+  $('.add-datepicker').datepicker({'format': 'yyyy-mm-dd'});
+});
diff --git a/app/assets/javascripts/editable.js b/app/assets/javascripts/editable.js
new file mode 100644
index 000000000..e28846cd1
--- /dev/null
+++ b/app/assets/javascripts/editable.js
@@ -0,0 +1,6 @@
+$(document).ready(function() {
+  $('.editable').click(function() {
+    $(this.dataset.form).show();
+    $(this.dataset.display).hide();
+  });
+});
diff --git a/app/assets/javascripts/plantings.js.coffee b/app/assets/javascripts/plantings.js.coffee
deleted file mode 100644
index ab5b73462..000000000
--- a/app/assets/javascripts/plantings.js.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
-
-jQuery ->
-  $('.add-datepicker').datepicker('format' : 'yyyy-mm-dd')
diff --git a/app/assets/javascripts/seeds.js.coffee b/app/assets/javascripts/seeds.js.coffee
deleted file mode 100644
index ab5b73462..000000000
--- a/app/assets/javascripts/seeds.js.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
-
-jQuery ->
-  $('.add-datepicker').datepicker('format' : 'yyyy-mm-dd')
diff --git a/app/assets/stylesheets/_crops.scss b/app/assets/stylesheets/_crops.scss
index 2d72137b9..4649812df 100644
--- a/app/assets/stylesheets/_crops.scss
+++ b/app/assets/stylesheets/_crops.scss
@@ -7,7 +7,7 @@
     bottom: 0;
     color: $white;
     margin: 0;
-    opacity: .9;
+    opacity: .8;
     position: absolute;
     text-align: center;
     width: 100%;
@@ -15,12 +15,16 @@
     h3 {
       background-color: $brown;
       font-size: 1em;
+      margin-bottom: 0;
+      padding-bottom: 0;
     }
 
     h5.crop-sci-name {
       background-color: $beige;
       color: $black;
       font-size: .7em;
+      margin-top: 0;
+      padding-top: 0;
     }
 
     a {
@@ -33,6 +37,7 @@
 
     .img-card {
       border: 5%;
+      border-radius: 5%;
     }
   }
 }
@@ -42,7 +47,6 @@
     height: 100%;
     margin: .1em;
     min-height: 300px;
-    width: 100px;
   }
 
   .img-thumbnail {
@@ -71,28 +75,18 @@
 }
 
 .crop-chip {
-  background-color: lighten($green, 20%);
-  border-radius: 25px;
-  display: inline-block;
-  font-size: 1em;
-  height: 30px;
-  line-height: 30px;
-  margin: .2em;
-  padding: 0 25px;
-
-  a {
-    color: $white;
-  }
-
-  img {
-    border-radius: 50%;
-    float: left;
-    height: 30px;
-    margin: 0 10px 0 -25px;
-    width: 30px;
-  }
+  background-color: lighten($brown, 20%);
 }
 
 .crop-hero-photo {
   max-height: 300px;
 }
+
+@include media-breakpoint-down(xs) {
+  .index-cards {
+    .crop-thumbnail {
+      margin: .2em;
+      width: 30%;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/_harvests.scss b/app/assets/stylesheets/_harvests.scss
index e69de29bb..560983965 100644
--- a/app/assets/stylesheets/_harvests.scss
+++ b/app/assets/stylesheets/_harvests.scss
@@ -0,0 +1,34 @@
+.harvest-thumbnail {
+  .text {
+    color: $white;
+    margin: 0;
+    opacity: .9;
+    position: absolute;
+    text-align: center;
+    top: 50%;
+    width: 100%;
+
+    h3 {
+      background-color: $green;
+      font-size: 1em;
+    }
+
+    h5 {
+      background-color: $brown;
+      color: $white;
+      font-size: .7em;
+    }
+
+    a {
+      color: $white;
+    }
+
+    a:hover {
+      color: $black;
+    }
+
+    .img-card {
+      border: 5%;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/_members.scss b/app/assets/stylesheets/_members.scss
index 1ab725311..188b4a317 100644
--- a/app/assets/stylesheets/_members.scss
+++ b/app/assets/stylesheets/_members.scss
@@ -19,25 +19,10 @@
 
 .member-chip {
   background-color: lighten($green, 30%);
-  border-radius: 25px;
-  display: inline-block;
-  font-size: .8em;
-  height: 30px;
-  line-height: 30px;
-  padding: 0 25px;
-  white-space: nowrap;
 
   a {
     color: $black;
   }
-
-  img {
-    border-radius: 50%;
-    float: left;
-    height: 30px;
-    margin: 0 10px 0 -25px;
-    width: 30px;
-  }
 }
 
 .member-location {
diff --git a/app/assets/stylesheets/_seeds.scss b/app/assets/stylesheets/_seeds.scss
index e69de29bb..e875832ff 100644
--- a/app/assets/stylesheets/_seeds.scss
+++ b/app/assets/stylesheets/_seeds.scss
@@ -0,0 +1,10 @@
+.seed-card {
+  .text {
+    color: $white;
+    margin: 0;
+    position: absolute;
+    text-align: center;
+    top: 1em;
+    width: 100%;
+  }
+}
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
index 5d9bdda5b..0f46481a7 100644
--- a/app/assets/stylesheets/_variables.scss
+++ b/app/assets/stylesheets/_variables.scss
@@ -14,7 +14,8 @@ $white: #fff;
 $body-bg: $beige;
 $text-color: $brown;
 $link-color: $green;
-$graph-hover: $orange;
+
+$default-font: "Fira Sans", Helvetica, Arial, sans-serif;
 
 $primary: (
   color: $green,
diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index df44ca6e8..f9d965fec 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -5,7 +5,7 @@ body {
 
 body {
   background-color: $beige;
-  font-family: $font-family-sans-serif;
+  font-family: $default-font;
 }
 
 .ellipsis {
@@ -29,7 +29,7 @@ a:hover {
 }
 
 h1 {
-  font-size: 180%;
+  font-size: 250%;
 }
 
 h2 {
@@ -59,6 +59,7 @@ section {
 
   h2 {
     background-color: $green;
+    box-shadow: 1px 1px 1px 1px darken($beige, 20%);
     color: $white;
     padding: .2em;
 
@@ -68,7 +69,11 @@ section {
   }
 
   .btn {
-    border: 1px solid $green;
+    border: 1px solid $brown;
+  }
+
+  .card {
+    box-shadow: 1px 3px 3px 1px darken($beige, 20%);
   }
 }
 
@@ -84,7 +89,6 @@ section {
 
   .card {
     background: $white;
-    // border: 1px solid lighten($brown, 20%);
     border-radius: 5%;
     margin: .5em .5em .5em 0;
     width: 200px;
@@ -94,6 +98,12 @@ section {
       border-top-right-radius: 5%;
     }
   }
+  .card-finished {
+    background: darken($beige, 10%);
+    a {
+      color: $brown;
+    }
+  }
 
   .card:hover {
     background-color: $beige;
@@ -104,7 +114,7 @@ section {
   margin-bottom: 1em;
 
   .img-card {
-    height: 180px;
+    height: 200px;
     object-fit: cover;
     width: 100%;
   }
@@ -143,6 +153,17 @@ section {
   }
 }
 
+img.img-cute {
+  bottom: -6px;
+  left: 45px;
+  position: relative;
+  width: 3em;
+}
+
+img.img-tiny {
+  width: 50px;
+}
+
 img.img-icon {
   width: 1.2em;
 }
@@ -158,16 +179,8 @@ img.avatar {
   z-index: 2;
 }
 
-.progress {
-  border-radius: 0;
-  height: 2em;
-  .progress-bar {
-    height: 2em;
-    background-color: $progress-bar-color
-  }
-  .progress-bar-text {
-    text-align: center;
-  }
+.progress-bar {
+  border-bottom: 1em solid $progress-bar-color;
 }
 
 ul.associations {
@@ -312,6 +325,29 @@ ul.thumbnail-buttons {
   background-color: $beige;
 }
 
+.chip {
+  background-color: lighten($brown, 20%);
+  border-radius: 25px;
+  color: $white;
+  display: inline-block;
+  height: 30px;
+  line-height: 30px;
+  margin: .2em;
+  padding: 0 25px;
+
+  a {
+    color: $white;
+  }
+
+  img {
+    border-radius: 50%;
+    float: left;
+    height: 30px;
+    margin: 0 10px 0 -25px;
+    width: 30px;
+  }
+}
+
 // Overrides applying only to mobile view. This must be at the end of the overrides file.
 // Extra small devices (portrait phones, less than 576px)
 @include media-breakpoint-down(xs) {
@@ -371,7 +407,7 @@ ul.thumbnail-buttons {
   .index-cards {
     .card {
       margin: .2em;
-      width: 45%;
+      width: 48%;
 
       // Shrink title to fit more on page
       .card-title {
diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index 65a559423..e0c373060 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -113,7 +113,10 @@ class CropsController < ApplicationController
       recreate_names('alt_name', 'alternate')
       recreate_names('sci_name', 'scientific')
 
-      notifier.deliver_now! if @crop.approval_status_changed?(from: "pending", to: "approved")
+      if @crop.approval_status_changed?(from: "pending", to: "approved")
+        notifier.deliver_now!
+        @crop.update_openfarm_data!
+      end
     else
       @crop.approval_status = @crop.approval_status_was
     end
diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index f9037923a..4fff56da5 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -5,20 +5,17 @@ class GardensController < ApplicationController
   responders :flash
   respond_to :html, :json
 
-  # GET /gardens
-  # GET /gardens.json
   def index
     @owner = Member.find_by(slug: params[:member_slug])
     @show_all = params[:all] == '1'
 
     @gardens = @gardens.active unless @show_all
     @gardens = @gardens.where(owner: @owner) if @owner.present?
-    @gardens = @gardens.joins(:owner).order(:name).paginate(page: params[:page])
+    @gardens = @gardens.where.not(members: { confirmed_at: nil })
+      .order(:name).paginate(page: params[:page])
     respond_with(@gardens)
   end
 
-  # GET /gardens/1
-  # GET /gardens/1.json
   def show
     @current_plantings = @garden.plantings.current
       .includes(:crop, :owner)
@@ -29,35 +26,26 @@ class GardensController < ApplicationController
     respond_with(@garden)
   end
 
-  # GET /gardens/new
-  # GET /gardens/new.json
   def new
     @garden = Garden.new
     respond_with(@garden)
   end
 
-  # GET /gardens/1/edit
   def edit
     respond_with(@garden)
   end
 
-  # POST /gardens
-  # POST /gardens.json
   def create
     @garden.owner_id = current_member.id
     flash[:notice] = I18n.t('gardens.created') if @garden.save
     respond_with(@garden)
   end
 
-  # PUT /gardens/1
-  # PUT /gardens/1.json
   def update
     flash[:notice] = I18n.t('gardens.updated') if @garden.update(garden_params)
     respond_with(@garden)
   end
 
-  # DELETE /gardens/1
-  # DELETE /gardens/1.json
   def destroy
     @garden.destroy
     flash[:notice] = I18n.t('gardens.deleted')
diff --git a/app/controllers/harvests_controller.rb b/app/controllers/harvests_controller.rb
index f1c98fe86..353e338d6 100644
--- a/app/controllers/harvests_controller.rb
+++ b/app/controllers/harvests_controller.rb
@@ -43,7 +43,11 @@ class HarvestsController < ApplicationController
     @harvest.crop_id = @harvest.planting.crop_id if @harvest.planting_id
     @harvest.harvested_at = Time.zone.now if @harvest.harvested_at.blank?
     @harvest.save
-    respond_with(@harvest)
+    if params[:return] == 'planting'
+      respond_with(@harvest, location: @harvest.planting)
+    else
+      respond_with(@harvest)
+    end
   end
 
   def update
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 1bbbefc93..09004b823 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -61,6 +61,7 @@ class PlantingsController < ApplicationController
 
   def create
     @planting = Planting.new(planting_params)
+    @planting.planted_at = Time.zone.now if @planting.planted_at.blank?
     @planting.owner = current_member
     @planting.crop = @planting.parent_seed.crop if @planting.parent_seed.present?
     @planting.save
diff --git a/app/controllers/seeds_controller.rb b/app/controllers/seeds_controller.rb
index 1989db825..207b8d639 100644
--- a/app/controllers/seeds_controller.rb
+++ b/app/controllers/seeds_controller.rb
@@ -6,19 +6,15 @@ class SeedsController < ApplicationController
   respond_to :csv, only: :index
   respond_to :rss, only: :index
 
-  # GET /seeds
-  # GET /seeds.json
   def index
     @owner = Member.find_by(slug: params[:member_slug]) if params[:member_slug].present?
     @crop = Crop.find_by(slug: params[:crop_slug]) if params[:crop_slug].present?
     @planting = Planting.find_by(slug: params[:planting_id]) if params[:planting_id].present?
 
-    @seeds = @seeds.where(owner: @owner) if @owner.present?
-    @seeds = @seeds.where(crop: @crop) if @crop.present?
-    @seeds = @seeds.where(parent_planting: @planting) if @planting.present?
-    @seeds = @seeds.order(created_at: :desc).includes(:owner, :crop).paginate(page: params[:page])
+    @show_all = (params[:all] == '1')
 
     @filename = csv_filename
+    @seeds = seeds.order(created_at: :desc).includes(:owner, :crop).paginate(page: params[:page])
 
     respond_with(@seeds)
   end
@@ -46,7 +42,11 @@ class SeedsController < ApplicationController
     @seed.owner = current_member
     @seed.crop = @seed.parent_planting.crop if @seed.parent_planting
     flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
-    respond_with(@seed)
+    if params[:return] == 'planting'
+      respond_with(@seed, location: @seed.parent_planting)
+    else
+      respond_with(@seed)
+    end
   end
 
   def update
@@ -61,6 +61,15 @@ class SeedsController < ApplicationController
 
   private
 
+  def seeds
+    records = Seed.all
+    records = records.where(owner: @owner) if @owner.present?
+    records = records.where(crop: @crop) if @crop.present?
+    records = records.where(parent_planting: @planting) if @planting.present?
+    records = records.active unless @show_all
+    records
+  end
+
   def seed_params
     params.require(:seed).permit(
       :crop_id, :description, :quantity, :plant_before,
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 29f0ab05b..68ee9c7d8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -63,15 +63,15 @@ module ApplicationHelper
     pluralize(collection.size, model.model_name.to_s.downcase)
   end
 
-  def show_inactive_tickbox_path(type, owner, show_all)
+  def show_inactive_tickbox_path(type, owner: nil, show_all: false)
     all = show_all ? '' : 1
-    if owner
-      return member_plantings_path(owner, all: all) if type == 'plantings'
-      return member_gardens_path(owner, all: all) if type == 'gardens'
-    end
 
-    return plantings_path(all: all) if type == 'plantings'
-    return gardens_path(all: all) if type == 'gardens'
+    path = if owner.present?
+             public_send("member_#{type}_path", owner, all: all)
+           else
+             public_send("#{type}_path", all: all)
+           end
+    path
   end
 
   def title(type, owner, crop, planting)
diff --git a/app/helpers/buttons_helper.rb b/app/helpers/buttons_helper.rb
index cbcab26a3..05fc2798d 100644
--- a/app/helpers/buttons_helper.rb
+++ b/app/helpers/buttons_helper.rb
@@ -107,7 +107,7 @@ module ButtonsHelper
 
     link_to new_photo_path(id: model.id, type: model_type_for_photo(model)),
             class: classes do
-      photo_icon + ' ' + t('buttons.add_photo')
+      add_photo_icon + ' ' + t('buttons.add_photo')
     end
   end
 
diff --git a/app/helpers/editable_form_helper.rb b/app/helpers/editable_form_helper.rb
new file mode 100644
index 000000000..00cabebad
--- /dev/null
+++ b/app/helpers/editable_form_helper.rb
@@ -0,0 +1,6 @@
+module EditableFormHelper
+  def editable(field_type, model, field, display_field:, collection: [])
+    render 'shared/editable/form', field_type: field_type,
+      model: model, field: field, display_field: display_field, collection: collection
+  end
+end
diff --git a/app/helpers/gardens_helper.rb b/app/helpers/gardens_helper.rb
index fd406431e..1ebb589f0 100644
--- a/app/helpers/gardens_helper.rb
+++ b/app/helpers/gardens_helper.rb
@@ -9,10 +9,6 @@ module GardensHelper
     end
   end
 
-  def gardens_active_tickbox_path(owner, show_all)
-    show_inactive_tickbox_path('gardens', owner, show_all)
-  end
-
   def display_garden_name(garden)
     truncate(garden.name, length: 50, separator: ' ', omission: '... ')
   end
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index b21cf0757..d5839ed05 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -5,12 +5,20 @@ module IconsHelper
     send("#{event_model}_icon")
   end
 
+  def cute_icon
+    icons = %w(slug sprinkler bee ant hose grass rabbit slug-eating snail earth-worm insect watering-can
+               wheelbarrow cat spiderweb bug butterfly ladybird stones)
+    rand_num = rand(1..icons.size)
+    icon = icons[rand_num - 1]
+    image_tag("icons/#{icon}.svg", class: 'img img-cute', alt: icon)
+  end
+
   def timeline_icon
-    icon('far', 'calendar')
+    image_icon 'timeline'
   end
 
   def garden_icon
-    image_icon 'home'
+    image_icon 'gardens'
   end
 
   def planting_icon
@@ -34,19 +42,23 @@ module IconsHelper
   end
 
   def finished_icon
-    icon('fas', 'calendar')
+    image_icon 'finish'
   end
 
   def edit_icon
-    icon('fas', 'edit')
+    image_icon 'edit'
   end
 
   def delete_icon
-    icon('fas', 'trash-alt')
+    image_icon 'delete'
+  end
+
+  def add_photo_icon
+    image_icon 'add-photo'
   end
 
   def photo_icon
-    icon('fas', 'camera-retro')
+    image_icon 'photo'
   end
 
   def seedling_icon
@@ -84,10 +96,15 @@ module IconsHelper
   end
 
   def sunniness_icon(sunniness)
-    if sunniness.present?
-      image_tag("sunniness_#{sunniness}.png", class: 'img', alt: sunniness, width: 55)
+    case sunniness
+    when 'sun'
+      icon 'far', 'sun'
+    when 'shade'
+      icon 'fas', 'umbrella-beach'
+    when 'semi-shade'
+      icon 'fas', 'cloud-sun'
     else
-      image_tag("sunniness_not_specified.png", class: 'img', alt: 'unknown', width: 55)
+      icon 'fas', 'question'
     end
   end
 
diff --git a/app/helpers/plantings_helper.rb b/app/helpers/plantings_helper.rb
index 537ae7631..2c28eda76 100644
--- a/app/helpers/plantings_helper.rb
+++ b/app/helpers/plantings_helper.rb
@@ -29,8 +29,8 @@ module PlantingsHelper
     end
   end
 
-  def plantings_active_tickbox_path(owner, show_all)
-    show_inactive_tickbox_path('plantings', owner, show_all)
+  def weeks_from_not_to_finished(planting)
+    days_from_now_to_finished(planting) / 7
   end
 
   def days_from_now_to_finished(planting)
@@ -45,6 +45,10 @@ module PlantingsHelper
     (planting.first_harvest_predicted_at - Time.zone.today).to_i
   end
 
+  def weeks_from_now_to_first_harvest(planting)
+    days_from_now_to_first_harvest(planting) / 7
+  end
+
   def days_from_now_to_last_harvest(planting)
     return unless planting.planted_at.present? && planting.last_harvest_predicted_at.present?
 
diff --git a/app/models/concerns/predict_planting.rb b/app/models/concerns/predict_planting.rb
index 8b2961f64..052f7ed55 100644
--- a/app/models/concerns/predict_planting.rb
+++ b/app/models/concerns/predict_planting.rb
@@ -41,6 +41,10 @@ module PredictPlanting
       (Time.zone.today - planted_at).to_i if planted_at.present?
     end
 
+    def weeks_since_planted
+      days_since_planted / 7
+    end
+
     # progress
     def percentage_grown
       if finished?
diff --git a/app/models/crop.rb b/app/models/crop.rb
index a9dfabe52..d0283a2b6 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -10,7 +10,6 @@ class Crop < ApplicationRecord
   belongs_to :requester, class_name: 'Member', optional: true, inverse_of: :requested_crops
   belongs_to :parent, class_name: 'Crop', optional: true, inverse_of: :varieties
   has_many :scientific_names, dependent: :delete_all
-  accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
   has_many :alternate_names, dependent: :delete_all
   has_many :plantings, dependent: :destroy
   has_many :seeds, dependent: :destroy
@@ -24,6 +23,8 @@ class Crop < ApplicationRecord
   has_many :crop_posts, dependent: :delete_all
   has_many :posts, through: :crop_posts, dependent: :delete_all
 
+  accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
+
   ##
   ## Scopes
   scope :recent, -> { approved.order(created_at: :desc) }
@@ -95,6 +96,10 @@ class Crop < ApplicationRecord
       .count("harvests.id")
   end
 
+  def perennial?
+    perennial == true
+  end
+
   def annual?
     perennial == false
   end
diff --git a/app/models/harvest.rb b/app/models/harvest.rb
index 8a78ad4fc..36f61965f 100644
--- a/app/models/harvest.rb
+++ b/app/models/harvest.rb
@@ -111,15 +111,11 @@ class Harvest < ApplicationRecord
   end
 
   def unit_to_human
-    return "" unless quantity
+    return "" unless quantity && unit
+    return 'individual' if unit == 'individual'
+    return "#{unit} of" if quantity == 1
 
-    if unit == 'individual'
-      'individual'
-    elsif quantity == 1
-      "#{unit} of"
-    else
-      "#{unit.pluralize} of"
-    end
+    "#{unit.pluralize} of"
   end
 
   def weight_to_human
diff --git a/app/models/photo.rb b/app/models/photo.rb
index a1e7099c1..1490c33dc 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -7,8 +7,8 @@ class Photo < ApplicationRecord
   has_many :photo_associations, foreign_key: :photo_id, dependent: :delete_all, inverse_of: :photo
   has_many :crops, through: :photo_associations
 
-  validates :fullsize_url, url: true, uniqueness: true
-  validates :thumbnail_url, url: true, uniqueness: true
+  validates :fullsize_url, url: true
+  validates :thumbnail_url, url: true
 
   # creates a relationship for each assignee type
   PHOTO_CAPABLE.each do |type|
diff --git a/app/models/planting.rb b/app/models/planting.rb
index 0555e4ac5..868f36735 100644
--- a/app/models/planting.rb
+++ b/app/models/planting.rb
@@ -33,6 +33,8 @@ class Planting < ApplicationRecord
   ##
   ## Scopes
   scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
+  scope :annual, -> { joins(:crop).where(crops: { perennial: false }) }
+  scope :perennial, -> { joins(:crop).where(crops: { perennial: true }) }
   scope :interesting, -> { has_photos.one_per_owner.order(planted_at: :desc) }
   scope :recent, -> { order(created_at: :desc) }
   scope :one_per_owner, lambda {
diff --git a/app/models/seed.rb b/app/models/seed.rb
index 8e0544b52..32c0ef6a5 100644
--- a/app/models/seed.rb
+++ b/app/models/seed.rb
@@ -53,7 +53,7 @@ class Seed < ApplicationRecord
   scope :interesting, -> { tradable.has_location }
   scope :has_location, -> { joins(:owner).where.not("members.location": nil) }
   scope :recent, -> { order(created_at: :desc) }
-  scope :active, -> { where('finished_at < ?', Time.zone.now) }
+  scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
 
   def tradable?
     tradable_to != 'nowhere'
diff --git a/app/views/crops/_actions.html.haml b/app/views/crops/_actions.html.haml
index 1fd159662..835edea1c 100644
--- a/app/views/crops/_actions.html.haml
+++ b/app/views/crops/_actions.html.haml
@@ -1,16 +1,22 @@
-- if @crop.approved? && signed_in?
-  .nav.crop-actions
-    - if can? :create, Planting
-      = link_to new_planting_path(crop_id: crop.id), class: 'list-group-item btn' do
-        = planting_icon
-        = t('buttons.plant_crop', crop_name: crop.name)
-
-    - if can? :create, Harvest
-      = link_to new_harvest_path(crop_id: crop.id), class: 'list-group-item btn' do
-        = harvest_icon
-        = t('buttons.harvest_crop', crop_name: crop.name)
-
-    - if can? :create, Seed
-      = link_to new_seed_path(crop_id: crop.id), class: 'list-group-item btn' do
-        = seed_icon
-        = t('buttons.add_seed_to_stash', crop_name: crop.name)
+- if crop.approved? && signed_in?
+  %ul.nav.crop-actions
+    %li.nav-item.dropdown.btn.btn-sm
+      %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'} Add to garden
+      .dropdown-menu.dropdown-secondary
+        - current_member.gardens.active.each do |garden|
+          = link_to plantings_path(planting: {crop_id: crop.id, garden_id: garden.id}), method: :post, class: 'dropdown-item' do
+            = garden.name
+        .dropdown-divider
+        = link_to 'add new garden', new_garden_path, class: 'dropdown-item'
+    %li.nav-item.dropdown.btn.btn-sm
+      %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'} Record harvest
+      .dropdown-menu.dropdown-secondary
+        - PlantPart.all.each do |plant_part|
+          = link_to harvests_path(harvest: {crop_id: crop.id, plant_part_id: plant_part.id}), method: :post, class: 'dropdown-item' do
+            = plant_part.name
+    %li.nav-item.dropdown.btn.btn-sm
+      %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'}=t('buttons.save_seeds', crop_name: crop.name)
+      .dropdown-menu.dropdown-secondary
+        - Seed::TRADABLE_TO_VALUES.each do |trade|
+          = link_to seeds_path(seed: {crop_id: crop.id, tradable_to: trade}), method: :post, class: 'dropdown-item' do
+            Will trade: #{trade}
diff --git a/app/views/crops/_form.html.haml b/app/views/crops/_form.html.haml
index a0f981959..2ef58f243 100644
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -41,6 +41,8 @@
         = f.radio_button(:perennial, true, label: "Perennial")
         %span.help-block Living more than two years
 
+      - unless @crop.approved?
+        = link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
       = f.text_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
       %span.help-block
         Link to the crop's page on the English language Wikipedia (required).
diff --git a/app/views/crops/_hierarchy.html.haml b/app/views/crops/_hierarchy.html.haml
index 989c5145b..2e8af76c3 100644
--- a/app/views/crops/_hierarchy.html.haml
+++ b/app/views/crops/_hierarchy.html.haml
@@ -5,6 +5,8 @@
   - display_crops.each do |c|
     %li.crop-hierarchy{ class: (max != 0 && @count >= max) || !c.approved? ? ['hide', 'toggle'] : [] }
       = render 'crops/tiny', crop: c
+      - if c.perennial
+        = perennial_icon
       - @count += 1
       - if c.varieties.present?
         - c.varieties.order(:name).each do |v|
diff --git a/app/views/crops/_info.haml b/app/views/crops/_info.haml
index efaf693cc..2e4266dc6 100644
--- a/app/views/crops/_info.haml
+++ b/app/views/crops/_info.haml
@@ -1,15 +1,18 @@
 .row
   .col-md-9
-    %h1
+    %h1.display-3
       = crop_icon(@crop)
       %strong= @crop.name.titleize
       - unless @crop.approved?
         %badge.badge-warning=@crop.approval_status
       %small.text-muted= @crop.default_scientific_name
     - if @crop.sowing_method.present?
-      %h2= @crop.sowing_method
+      %h2
+        How to sow #{@crop.name}:
+        = @crop.sowing_method
     - if @crop.sun_requirements.present?
       %p
+        %strong Sun requirement for #{@crop}:
         Plant in #{@crop.sun_requirements}
     %p.text-muted
       - if !@crop.plantings.empty?
diff --git a/app/views/crops/_posts.html.haml b/app/views/crops/_posts.html.haml
index 1fcfea2fc..1ce1bc7ff 100644
--- a/app/views/crops/_posts.html.haml
+++ b/app/views/crops/_posts.html.haml
@@ -12,11 +12,11 @@
               locals: { to: "post your tips and experiences growing #{crop.name.pluralize}" }
 - else
 
-  = render 'layouts/pagination', collection: @posts
+  = will_paginate @posts
 
   .index-cards
     - @posts.each do |post|
       = render 'posts/preview', post: post
 
-  = render 'layouts/pagination', collection: @posts
+  = will_paginate @posts
 
diff --git a/app/views/crops/_predictions.html.haml b/app/views/crops/_predictions.html.haml
index 02e3bbacc..456756fe4 100644
--- a/app/views/crops/_predictions.html.haml
+++ b/app/views/crops/_predictions.html.haml
@@ -6,19 +6,23 @@
     .card.fact-card
       .card-body.text-center
         %h3
-          = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
-            - if crop.perennial == true
+          = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution', class: 'crop-longevity' do
+            - if crop.perennial?
               Perennial
-            - elsif crop.perennial == false
+            - elsif crop.annual?
               Annual
-
-        %strong
+        %strong.crop-longevity
           %i.far.fa-calendar
 
         - if crop.perennial == true
           %small living more than two years
         - elsif crop.perennial == false
           %small living and reproducing in a single year or less
+        - if can? :wrangle, @crop
+          %small.edit-link
+            = bootstrap_form_for(@crop) do |f|
+              = f.hidden_field :perennial, value: crop.annual?
+              = f.submit :toggle
 
   - if crop.annual? && crop.median_lifespan.present?
     .card.fact-card
@@ -28,7 +32,6 @@
         %i.fas.fa-sun-o.fa-5x.pt-3.amber-text
         %span days
 
-
   - if crop.median_days_to_first_harvest.present?
     .card.fact-card
       .card-body.text-center
diff --git a/app/views/crops/_tiny.html.haml b/app/views/crops/_tiny.html.haml
index 8b948a9cc..512379059 100644
--- a/app/views/crops/_tiny.html.haml
+++ b/app/views/crops/_tiny.html.haml
@@ -1,7 +1,7 @@
 - if crop.approved? || can?(:wrangle, Crop)
-  .crop-chip
-    = link_to crop do
+  = link_to crop do
+    %span.chip.crop-chip
       = crop_icon(crop)
       = crop.name
-    - unless crop.approved?
-      %badge.badge-warning= crop.approval_status
+      - unless crop.approved?
+        %badge.badge-warning= crop.approval_status
diff --git a/app/views/crops/index.html.haml b/app/views/crops/index.html.haml
index 07e0d37b7..220a38bdb 100644
--- a/app/views/crops/index.html.haml
+++ b/app/views/crops/index.html.haml
@@ -9,29 +9,24 @@
 - content_for :breadcrumbs do
   %li.breadcrumb-item.active= link_to 'Crops', crops_path
 
-%h1=t('.title')
-%p
-  #{ENV['GROWSTUFF_SITE_NAME']} tracks who's growing what, where.
-  View any crop page to see which of our members have planted it and find
-  information on how to grow it yourself.
-
-
 = bootstrap_form_tag(url: crops_path, method: :get, layout: :inline) do |f|
-  = f.select "sort",
-               options_for_select({ "popularity": 'popular',
-                                    "alphabetically": 'alpha' },
-                                    @sort || 'popular'),
-               label: 'Sort by'
-  = f.submit "Show"
+  .input-group
+    = f.select "sort",
+                 options_for_select({ "popularity": 'popular',
+                                      "alphabetically": 'alpha' },
+                                      @sort || 'popular'),
+                 label: 'Sort by'
+    = f.submit "Show"
+  = f.select :sort, append: f.primary('Show'), input_group_class: 'input-group-lg'
 
-= render 'layouts/pagination', collection: @crops
-
-.crops
+%section.crops
+  %h2= t('.title')
+  = will_paginate @crops
   .index-cards
     - @crops.each do |crop|
       = render 'crops/thumbnail', crop: crop
 
-= render 'layouts/pagination', collection: @crops
+  = will_paginate @crops
 
 %ul.list-inline
   %li The data on this page is available in the following formats:
diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index bb4a25287..cc9b680fe 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -17,34 +17,38 @@
 .jumbotron= render 'crops/info'
 
 .row
-  .col-md-9
-    %p= render 'crops/actions', crop: @crop
-  .col-md-3
-    = render 'wrangle', crop: @crop
+  .col-md-9= render 'crops/actions', crop: @crop
+  .col-md-3= render 'wrangle', crop: @crop
 .row
   .col-md-9
-    %section.prediction= render 'predictions', crop: @crop
+    %section.prediction
+      = cute_icon
+      = render 'predictions', crop: @crop
     - if @crop.companions.any?
       %section.companions
         %h2 Companions
         - @crop.companions.each do |companion|
           = render 'crops/tiny', crop: companion
 
-    %section.photos= render 'crops/photos', photos: @photos, crop: @crop
+    %section.photos
+      = cute_icon
+      = render 'crops/photos', photos: @photos, crop: @crop
 
     - if @crop.plantings.any?
-      .card-deck.text-center
-        .col-md-4
-          %h3.section-heading.h3.pt-4 Sunniness
-          = pie_chart crop_sunniness_path(@crop, format: :json), legend: "bottom"
-        .col-md-4
-          %h3.section-heading.h3.pt-4 Planted from
-          = pie_chart crop_planted_from_path(@crop, format: :json), legend: "bottom"
-        .col-md-4
-          %h3.section-heading.h3.pt-4 Harvested for
-          = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
+      %section.charts
+        .row
+          .col-lg-4.col-12
+            %h2 Sunniness
+            = pie_chart crop_sunniness_path(@crop, format: :json), legend: "bottom"
+          .col-lg-4.col-12
+            %h2 Planted from
+            = pie_chart crop_planted_from_path(@crop, format: :json), legend: "bottom"
+          .col-lg-4.col-12
+            %h2 Harvested for
+            = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
 
-    %section.varieties= render 'varieties', crop: @crop
+    %section.varieties
+      = render 'varieties', crop: @crop
 
     %section.crop-map
       %h2
@@ -59,6 +63,7 @@
     %section.posts= render 'crops/posts', crop: @crop
 
   .col-md-3
+    = cute_icon
     .card
       .card-body
         %h4 How to grow #{@crop.name.pluralize}
@@ -101,6 +106,7 @@
     = render 'harvests', crop: @crop
     = render 'find_seeds', crop: @crop
 
+    = cute_icon
     .card
       .card-body
         %h5.card-title Learn more about #{@crop.name.pluralize}
diff --git a/app/views/gardens/index.html.haml b/app/views/gardens/index.html.haml
index ce0d67833..d4fba0eae 100644
--- a/app/views/gardens/index.html.haml
+++ b/app/views/gardens/index.html.haml
@@ -13,7 +13,7 @@
     %li.breadcrumb-item.active= link_to 'Gardens', gardens_path
 
 %section.border-top
-  = link_to gardens_active_tickbox_path(@owner, @show_all), class: 'btn'  do
+  = link_to show_inactive_tickbox_path('gardens', owner: @owner, show_all: @show_all), class: 'btn'  do
     = check_box_tag 'active', 'all', @show_all
     include in-active
 
@@ -25,17 +25,31 @@
 - else
   = page_entries_info @gardens
   = will_paginate @gardens
-  - @gardens.each do |garden|
-    %section
-      %h2
-        = link_to garden.name, garden
-      = render 'gardens/actions', garden: garden
-      - if garden.plantings.any?
-        .index-cards
-          - garden.plantings.active.each do |planting|
-            = render planting, full: true
-      - else
-        No plantings
+  .row
+    - @gardens.each do |garden|
+      .col-md-6.col-12
+        %section.card
+          %h2= link_to garden.name, garden
+          .card-header
+            .row
+              - unless @owner.present?
+                .col
+                  owner:
+                  = render 'members/tiny', member: garden.owner
+              .col= render 'gardens/actions', garden: garden
+              .col
+                - if garden.plantings.any?
+                  - if garden.plantings.active.perennial.any?
+                    %strong Perennials:
+                    - garden.plantings.active.perennial.each do |planting|
+                      = link_to planting do
+                        = crop_icon planting.crop
+                        = planting.crop
+          .card-body
+            - if garden.plantings.active.annual.any?
+              = render 'plantings/progress_list', plantings: garden.plantings.active.annual
+            - else
+              No annual plantings
 
   .row
     .col-12= page_entries_info @gardens
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index ae51892fa..78f29f363 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -10,20 +10,16 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
-- content_for :scripts do
-  = javascript_include_tag "charts"
-  = javascript_include_tag "https://www.gstatic.com/charts/loader.js"
-
-
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Gardens', gardens_path
   %li.breadcrumb-item.active= link_to @garden.name, gardens_path(@garden)
 
 .row
-  .col-md-9.col-sm-12
+  .col-md-9.col-12
     %h2.h1
       %strong= @garden
-      = render 'gardens/actions', garden: @garden
+  .col-md-3.col-12
+    = render 'gardens/actions', garden: @garden
 .row
   .col-md-9
     - unless @garden.active
@@ -32,7 +28,6 @@
         - if can? :edit, @garden
           = link_to 'Set it to active', edit_garden_path(@garden)
           to plant something in this garden.
-
     %div
       %p
         :growstuff_markdown
@@ -47,11 +42,10 @@
                 = link_to 'tell us more.', edit_garden_path(@garden)
 
     - if @garden.plantings.where.not(planted_at: nil).any?
-      .row
-        .col-md-12
-          %section
-            %h2 Garden timeline
-            = timeline garden_timeline_path(@garden), adapter: "google"
+      %section.card
+        %h2 Garden progress
+        .card-body
+          = render 'plantings/progress_list', plantings: @garden.plantings.active
 
     %section
       %h2 Current plantings in garden
@@ -67,7 +61,7 @@
       .index-cards
         - if @finished_plantings.size.positive?
           - @finished_plantings.each do |planting|
-            = render "plantings/thumbnail",  planting: planting
+            = render "plantings/tiny",  planting: planting
         - else
           %p Nothing has been planted here.
   .col-md-3
diff --git a/app/views/harvests/_card.html.haml b/app/views/harvests/_card.html.haml
index 51d077338..53ddcc3d0 100644
--- a/app/views/harvests/_card.html.haml
+++ b/app/views/harvests/_card.html.haml
@@ -6,7 +6,7 @@
       = crop_icon(harvest.crop)
       %strong
         = link_to harvest.crop, harvest
-      %span.badge.badge-pill= link_to harvest.plant_part, harvest.plant_part
+      %span.badge.badge-pill= harvest.plant_part
     - if harvest.planting.present?
       %p.card-text
         %small.text-muted
diff --git a/app/views/harvests/_thumbnail.html.haml b/app/views/harvests/_thumbnail.html.haml
index f29828b4f..8539d72d8 100644
--- a/app/views/harvests/_thumbnail.html.haml
+++ b/app/views/harvests/_thumbnail.html.haml
@@ -1,10 +1,9 @@
-.thumbnail
-  .harvest-thumbnail
-    - if harvest
-      = link_to image_tag(harvest_image_path(harvest),
-                          alt: harvest.crop.name, class: 'img'),
-                          harvest
-      .harvestinfo
-        .harvest-name
-          = link_to display_quantity(harvest), harvest
-  = I18n.l(harvest.harvested_at.to_date)
+.card.harvest-thumbnail
+  = link_to image_tag(harvest_image_path(harvest),
+                        alt: harvest,
+                        class: 'img img-card'),
+                        harvest
+
+  .text
+    %h3.harvest-plant-part= link_to harvest.plant_part, harvest
+    %h5.harvest-crop= harvest.crop
diff --git a/app/views/harvests/index.html.haml b/app/views/harvests/index.html.haml
index 527ce0e56..dd0ccfc29 100644
--- a/app/views/harvests/index.html.haml
+++ b/app/views/harvests/index.html.haml
@@ -29,7 +29,6 @@
   .index-cards=render @harvests, full: true
 
 .pagination
-  = page_entries_info @harvests
   = will_paginate @harvests
 
 %section.open-data
diff --git a/app/views/harvests/show.html.haml b/app/views/harvests/show.html.haml
index cc68a79bd..b5f98b55e 100644
--- a/app/views/harvests/show.html.haml
+++ b/app/views/harvests/show.html.haml
@@ -13,43 +13,55 @@
   %li.breadcrumb-item= link_to @harvest.owner, member_harvests_path(@harvest.owner)
   %li.breadcrumb-item.active= link_to @harvest, @harvest
 
-.row
-  .col-md-8
-    %h1
-      = harvest_icon
-      #{@harvest.crop} harvested by #{@harvest.owner}
-    = render 'harvests/actions', harvest: @harvest
-    = render partial: 'planting'
-    .index-cards.facts
-      - if @harvest.plant_part
+.harvest
+  .row
+    .col-md-8.col-xs-12
+      %h1
+        = harvest_icon
+        #{@harvest.crop} harvested by #{@harvest.owner}
+    .col-md-4.col-xs-12
+      = render 'harvests/actions', harvest: @harvest
+    .col-md-8.col-xs-12
+      = render partial: 'planting'
+      .index-cards.facts
+        - if @harvest.plant_part
+          .card
+            %h3
+              Plant part
+              = editable :select, @harvest, :plant_part_id, collection: PlantPart.all.pluck(:name, :id), display_field: '.harvest-plantpart'
+            %strong.harvest-plantpart= @harvest.plant_part
         .card
-          %h3 Plant part
-          %span= link_to @harvest.plant_part, @harvest.plant_part
-      - if @harvest.harvested_at.present?
+          %h3
+            Harvested
+            = editable :date, @harvest, :harvested_at, display_field: '.harvested_at'
+          %strong.harvested_at #{time_ago_in_words @harvest.harvested_at} ago
+          %span.harvested_at= I18n.l @harvest.harvested_at
+
+        .card{class: @harvest.quantity.present? ? '' : 'text-muted'}
+          %h3
+            Quantity
+            = editable :text_field, @harvest, :quantity, display_field: '.quantity'
+          %strong.quantity
+            = display_quantity(@harvest)
+
+      - if @harvest.photos.size.positive?
+        %section
+          %h2 Photos
+          = render 'photos/gallery', photos: @harvest.photos.order(date_taken: :desc).limit(3)
+      %section.harvest-detail
+        %h2 Detail
+        - if @harvest.planting.present?
+          Havested from
+          = link_to @harvest.planting, @harvest.planting
+
+      - if @harvest.description.present?
         .card
-          %h3 Harvested
-          %strong= I18n.l @harvest.harvested_at
-      .card
-        %h3 Quantity
-        %strong= display_quantity(@harvest)
-    - if @harvest.photos.size.positive?
-      %section
-        %h2 Photos
-        = render 'photos/gallery', photos: @harvest.photos.order(date_taken: :desc).limit(3)
-    %section.harvest-detail
-      %h2 Detail
-      - if @harvest.planting.present?
-        Havested from
-        = link_to @harvest.planting, @harvest.planting
+          .card-header
+            %h2 Notes
+          .card-body
+            :growstuff_markdown
+              #{strip_tags(@harvest.description)}
 
-    - if @harvest.description.present?
-      .card
-        .card-header
-          %h2 Notes
-        .card-body
-          :growstuff_markdown
-            #{strip_tags(@harvest.description)}
-
-  .col-md-4
-    = render 'harvests/owner', harvest: @harvest
-    = render @harvest.crop
+    .col-md-4.col-xs-12
+      = render 'harvests/owner', harvest: @harvest
+      = render @harvest.crop
diff --git a/app/views/home/_blurb.html.haml b/app/views/home/_blurb.html.haml
index 11582e8b6..e65a1c396 100644
--- a/app/views/home/_blurb.html.haml
+++ b/app/views/home/_blurb.html.haml
@@ -1,6 +1,6 @@
 .row
   .col-md-8.info
-    %h1.display-1= ENV['GROWSTUFF_SITE_NAME']
+    %h1.display-3= ENV['GROWSTUFF_SITE_NAME']
     %p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME'])
     = render 'stats'
   .col-md-4
diff --git a/app/views/home/_crops.html.haml b/app/views/home/_crops.html.haml
index 9a6d9d658..b463948c8 100644
--- a/app/views/home/_crops.html.haml
+++ b/app/views/home/_crops.html.haml
@@ -1,5 +1,5 @@
 - cache cache_key_for(Crop, 'homepage'), expires_in: 1.day do
   .index-cards
-    - Crop.interesting.includes(:scientific_names, :photos).shuffle.first(12).each do |crop|
+    - Crop.interesting.includes(:scientific_names, :photos).shuffle.first(18).each do |crop|
       = render 'crops/thumbnail', crop: crop
 
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 3b027c956..e5caaeab3 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -2,16 +2,23 @@
   = ENV['GROWSTUFF_SITE_NAME']
 
 - if member_signed_in?
-  %h1.display-2= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
+  .row
+    .col-lg-8.col-md-12
+      %h1.display-4= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
 
-  %p= render 'stats'
+      %p= render 'stats'
+    .col
+      %p
+        = link_to member_gardens_path(current_member), class: 'btn btn-dark' do
+          = image_icon 'gardens'
+          Show me my garden
 - else
   .hidden-xs
     %section.jumbotron= render 'blurb'
-
 .row
   .col-lg-8.col-md-12
     %section.crops
+      = cute_icon
       %h2= t('home.crops.our_crops')
       = render 'crops'
       = link_to "#{t('home.crops.view_all')} »", crops_path, class: 'btn btn-block'
@@ -23,14 +30,17 @@
 
   .col-xl-2.col
     %section.plantings
+      = cute_icon
       =render 'plantings'
       %p.text-right= link_to "#{t('home.plantings.view_all')} »", plantings_path, class: 'btn btn-block'
   .col-xl-2.col
     %section.harvests
+      = cute_icon
       = render 'harvests'
       %p.text-right= link_to "#{t('home.harvests.view_all')} »", harvests_path, class: 'btn btn-block'
   .col-12.col-md-6
     %section.seeds
+      = cute_icon
       = render 'seeds'
       %p.text-right= link_to "#{t('home.seeds.view_all')} »", seeds_path, class: 'btn btn-block'
   .col-12.col-md-6
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 9376d9a02..3783b7059 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -1,20 +1,58 @@
 %nav.navbar.navbar-expand-lg.navbar-dark.default-color.bg-dark
-  %a.navbar-brand.d-xs-none{ href: root_path }
-    = image_tag("growstuff-brand.png", size: "200x50", alt: ENV['GROWSTUFF_SITE_NAME'])
-  %a.navbar-brand.d-none.d-xs{ href: root_path }
-    = image_tag("growstuff-apple-touch-icon-precomposed.png",
-                size: "40x40", alt: ENV['GROWSTUFF_SITE_NAME'])
-  %button.navbar-toggler{"aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarSupportedContent", "data-toggle" => "collapse", type: "button"}
-    %span.navbar-toggler-icon
+  .row
+    .col-2.col-lg-4
+      .d-none.d-lg-inline
+        %a.navbar-brand{ href: root_path }
+          = image_tag("growstuff-brand.png", size: "200x50", alt: ENV['GROWSTUFF_SITE_NAME'])
+      .d-inline.d-lg-none
+        %a.navbar-brand{ href: root_path }
+          = image_tag("growstuff-apple-touch-icon-precomposed.png", size: "40x40",
+            alt: ENV['GROWSTUFF_SITE_NAME'])
+    .col-8.col-lg-7
+      = render 'crops/search_bar'
+    .col-2.col-lg-1
+      %button.navbar-toggler{"aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarSupportedContent", "data-toggle" => "collapse", type: "button"}
+        %i.fas.fa-ellipsis-v.navbar-toggler-icon
+
   #navbarSupportedContent.collapse.navbar-collapse
     %ul.navbar-nav.mr-auto
+      - if signed_in?
+        = link_to timeline_index_path, method: :get, class: 'nav-link text-white' do
+          = image_tag 'icons/notification.svg', class: 'img img-icon'
+        = link_to member_gardens_path(member_slug: current_member.slug), class: 'nav-link text-white' do
+          = image_icon 'gardens'
+        %li.nav-item.dropdown
+          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}
+            = image_tag "icons/gardener.svg", class: 'img img-icon'
+            = t('.record')
+          .dropdown-menu
+            = link_to new_planting_path, class: 'dropdown-item' do
+              = image_icon('planting-add')
+              = t('buttons.new_planting')
+            = link_to new_harvest_path, class: 'dropdown-item' do
+              = image_icon('harvest-add')
+              = t('buttons.new_harvest')
+            = link_to new_seed_path, class: 'dropdown-item' do
+              = image_icon('seed-add')
+              = t('buttons.new_seeds')
+            = link_to new_post_path, class: 'dropdown-item' do
+              = post_icon
+              = t('buttons.new_post')
+
       %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :href => "#", :role => "button"}= t('.crops')
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
         .dropdown-menu
-          = link_to t('.browse_crops'), crops_path, class: 'dropdown-item'
-          = link_to t('.seeds'), seeds_path, class: 'dropdown-item'
-          = link_to t('.plantings'), plantings_path, class: 'dropdown-item'
-          = link_to t('.harvests'), harvests_path, class: 'dropdown-item'
+          = link_to crops_path, class: 'dropdown-item' do
+            = t('.browse_crops')
+          = link_to seeds_path, class: 'dropdown-item' do
+            = seed_icon
+            = t('.seeds')
+          = link_to plantings_path, class: 'dropdown-item' do
+            = planting_icon
+            = t('.plantings')
+          = link_to harvests_path, class: 'dropdown-item' do
+            = harvest_icon
+            = t('.harvests')
 
       %li.nav-item.dropdown
         %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.community')
@@ -24,7 +62,6 @@
           = link_to t('.posts'), posts_path, class: 'dropdown-item'
           = link_to t('.forums'), forums_path, class: 'dropdown-item'
 
-
       - if member_signed_in?
         %li.nav-item.dropdown
           %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}
@@ -70,4 +107,3 @@
       - else
         %li.nav-item= link_to t('.sign_in'), new_member_session_path, id: 'navbar-signin', class: 'btn nav-link'
         %li.nav-item= link_to t('.sign_up'), new_member_registration_path, id: 'navbar-signup', class: 'btn nav-link'
-    = render 'crops/search_bar'
diff --git a/app/views/layouts/_nav.haml b/app/views/layouts/_nav.haml
index 07477f19a..7122a0e20 100644
--- a/app/views/layouts/_nav.haml
+++ b/app/views/layouts/_nav.haml
@@ -1,17 +1,15 @@
-%ul.nav
-  - if current_member.present?
-    %li.list-group-item.btn
-      = link_to url_for([current_member, model]) do
+- if current_member.present?
+  %ul.nav.crop-actions
+    %li.nav-item.dropdown.btn.btn-sm
+      = link_to url_for([current_member, model]), class: 'nav-link' do
         My #{model.model_name.human.pluralize}
+    %li.nav-item.dropdown.btn.btn-sm
+      = link_to model, class: 'nav-link' do
+        Everyone's #{model.model_name.human.pluralize}
+    - if can?(:create, model)
+      %li.nav-item.dropdown.btn.btn-sm
+        = link_to url_for([model, action: :new]), class: 'nav-link' do
+          Add a #{model.model_name.human}
 
-  %li.list-group-item.btn
-    = link_to model do
-      Everyone's #{model.model_name.human.pluralize}
-
-  - if can?(:create, model)
-    %li.list-group-item.btn
-      = link_to url_for([model, action: :new]) do
-        Add a #{model.model_name.human}
-
-- unless current_member
-  = render 'shared/signin_signup', to: "add a new #{model.to_s.downcase}"
+- else
+  = render 'shared/signin_signup', to: "record your #{model.to_s.pluralize.downcase}"
diff --git a/app/views/layouts/_pagination.html.haml b/app/views/layouts/_pagination.html.haml
deleted file mode 100644
index a57470a4b..000000000
--- a/app/views/layouts/_pagination.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= will_paginate collection
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a378fc735..72bb495c5 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -9,17 +9,14 @@
     %a{ name: 'skipnav' }
     #maincontainer.container-fluid
       .row
-        .col-12
-          .layout-actions= render 'shared/global_actions'
+        .col-md-8.col-12
           - if content_for?(:breadcrumbs)
-            .float-left
-              %nav{"aria-label" => "breadcrumb"}
-                %ol.breadcrumb
-                  %li.breadcrumb-item= link_to 'Home', root_path
-                  = yield(:breadcrumbs)
-
-          - if content_for?(:buttonbar)
-            = yield(:buttonbar)
+            %nav
+              %ol.breadcrumb{"aria-label" => "breadcrumb"}
+                %li.breadcrumb-item= link_to 'Home', root_path
+                = yield(:breadcrumbs)
+      - if content_for?(:buttonbar)
+        = yield(:buttonbar)
 
       - if content_for?(:subtitle)
         %small= yield(:subtitle)
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
new file mode 100644
index 000000000..8468a6b4c
--- /dev/null
+++ b/app/views/layouts/modal.html.haml
@@ -0,0 +1,11 @@
+#mainModal.modal{"aria-hidden" => "true", "aria-labelledby" => "mainModalLabel", role: "dialog", tabindex: "-1"}
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{"data-dismiss" => "modal", type: "button"}
+          %span{"aria-hidden" => "true"} &#215;
+          %span.sr-only Close
+        %h4#mainModalLabel.modal-title
+          = yield :title if content_for? :title
+          \&#160;
+      = yield
diff --git a/app/views/members/_tiny.haml b/app/views/members/_tiny.haml
index 4693bf373..95b51c2b0 100644
--- a/app/views/members/_tiny.haml
+++ b/app/views/members/_tiny.haml
@@ -1,4 +1,4 @@
-%span.member-chip
+%span.chip.member-chip
   - if member.discarded?
     = icon 'fas', 'user-times'
     = member
diff --git a/app/views/photos/_tiny.html.haml b/app/views/photos/_tiny.html.haml
new file mode 100644
index 000000000..3e95fb558
--- /dev/null
+++ b/app/views/photos/_tiny.html.haml
@@ -0,0 +1,3 @@
+- if photo.present?
+  .photo
+    = image_tag(photo.thumbnail_url, alt: photo.title, class: 'img img-tiny')
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 67f2da1a6..c286d8afc 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -13,11 +13,19 @@
 
 .row{id: "photo-#{@photo.id}"}
   .col-md-9
-    %h1.text-center.ellipsis
-      = photo_icon
-      = @photo.title
-    %p.text-center
-      = image_tag(@photo.fullsize_url, alt: @photo.title, class: 'rounded img-responsive shadow-sm')
+    %section.photo
+      %h2.text-center.ellipsis
+        = photo_icon
+        = @photo.title
+
+      %p.text-center
+        = image_tag(@photo.fullsize_url, alt: @photo.title, class: 'rounded img-responsive shadow-sm')
+
+
+    - if @crops.size.positive?
+      .index-cards
+        - @crops.each do |crop|
+          = render 'crops/thumbnail', crop: crop
   .col-md-3
     %p
       = render 'photos/actions', photo: @photo
@@ -26,14 +34,11 @@
           = icon 'fab', 'flickr'
         View on #{@photo.source.titleize}
       %span.btn= render 'photos/likes', photo: @photo
-
-    - if @crops.size.positive?
-      - @crops.each do |crop|
-        = render 'crops/tiny', crop: crop
-    %p
-      = render 'members/tiny', member: @photo.owner
       - if @photo.date_taken.present?
-        Taken on #{I18n.l @photo.date_taken.to_date}
+        %h3 Taken on #{I18n.l @photo.date_taken.to_date}
+
+    = render @photo.owner
+
     %p
       %strong License:
       - if @photo.license_url
diff --git a/app/views/plant_parts/index.html.haml b/app/views/plant_parts/index.html.haml
index 34846e9c3..22c4784da 100644
--- a/app/views/plant_parts/index.html.haml
+++ b/app/views/plant_parts/index.html.haml
@@ -1,21 +1,25 @@
 - content_for :title, "Plant parts"
 
+%h1 Plant Parts
+
 - if can? :create, PlantPart
-  = link_to 'New Plant part', new_plant_part_path
+  = link_to 'New Plant part', new_plant_part_path, class: 'btn btn-info'
 
-- @plant_parts.each do |plant_part|
-  %h2= plant_part
-  %p
-    - if plant_part.crops.empty?
-      No crops are harvested for this plant part (yet).
-    - else
-      - plant_part.crops.limit(100).each do |crop|
-        = link_to(crop, crop_path(crop))
-  %p
-    = link_to "More detail", plant_part
-
-  %p
-  - if can? :edit, plant_part
-    = link_to 'Edit', edit_plant_part_path(plant_part), class: 'btn btn-default btn-xs'
-  - if can? :destroy, plant_part
-    = link_to 'Delete', plant_part, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs'
+.index-cards
+  - @plant_parts.each do |plant_part|
+    .card.plant-part
+      .card-header
+        %h2= link_to plant_part, plant_part
+      .card-body
+        %p
+          - if plant_part.crops.empty?
+            No crops are harvested for this plant part (yet).
+          - else
+            - plant_part.crops.limit(20).each do |crop|
+              = render 'crops/tiny', crop: crop
+      .card-footer
+        %p
+          - if can? :edit, plant_part
+            = link_to 'Edit', edit_plant_part_path(plant_part), class: 'btn btn-default btn-xs'
+          - if can? :destroy, plant_part
+            = link_to 'Delete', plant_part, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs'
diff --git a/app/views/plantings/_badges.html.haml b/app/views/plantings/_badges.html.haml
index fd38ccb57..9d24a054e 100644
--- a/app/views/plantings/_badges.html.haml
+++ b/app/views/plantings/_badges.html.haml
@@ -7,18 +7,12 @@
         = planting_finish_button(planting)
       - elsif planting.late?
         %span.badge.badge-info.badge-late= t('.late_finishing')
-      - else
-        %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted days until planting is finished'}
-          = finished_icon
-          = t('label.days_until_finished', number: days_from_now_to_finished(planting))
 
     // Harvest times
     - unless planting.super_late?
       - if planting.harvest_time?
         %span.badge.badge-info.badge-harvest{'data-toggle': "tooltip", 'data-placement': "top", title: 'Planting is ready for harvesting now'}
-          = harvest_icon
           = t('label.harvesting_now')
       - elsif planting.before_harvest_time?
-        %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted days until harvest'}
-          = harvest_icon
-          = t('label.days_until_harvest', number: days_from_now_to_first_harvest(planting))
+        %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted weeks until harvest'}
+          = t('label.weeks_until_harvest', number: weeks_from_now_to_first_harvest(planting))
diff --git a/app/views/plantings/_card.html.haml b/app/views/plantings/_card.html.haml
index 479815afa..2f9ffc6d9 100644
--- a/app/views/plantings/_card.html.haml
+++ b/app/views/plantings/_card.html.haml
@@ -1,4 +1,4 @@
-.card.planting-card.planting
+.card.planting{class: planting.active? ? '' : 'card-finished'}
   = link_to planting do
     = image_tag planting_image_path(planting), class: 'img-card', alt: planting
   - if can? :edit, planting
@@ -17,10 +17,8 @@
           - if can? :destroy, planting
             .dropdown-divider
             = delete_button(planting, classes: 'dropdown-item text-danger')
-
-  .card-body.text-center
-    %h4.card-title= link_to planting.crop, planting
-    .text-center= render 'plantings/badges', planting: planting
-    = render 'plantings/progress', planting: planting
-  -# .card-footer
-  -#   .float-right=render 'members/tiny', member: planting.owner
\ No newline at end of file
+  = link_to planting do
+    .card-body.text-center
+      %h4= planting.crop
+      .text-center= render 'plantings/badges', planting: planting
+      = render 'plantings/progress', planting: planting
diff --git a/app/views/plantings/_descendants.html.haml b/app/views/plantings/_descendants.html.haml
index 64f93a2c8..2dd31b8d0 100644
--- a/app/views/plantings/_descendants.html.haml
+++ b/app/views/plantings/_descendants.html.haml
@@ -1,9 +1,17 @@
 %h2 Seeds saved
+
+%a.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button"}
+  = seed_icon
+  = t('buttons.save_seeds')
+.dropdown-menu.dropdown-secondary
+  - Seed::TRADABLE_TO_VALUES.each do |trade|
+    = link_to seeds_path(return: 'planting', seed: {crop_id: planting.crop.id, parent_planting_id: planting.id, tradable_to: trade}), method: :post, class: 'dropdown-item' do
+      Will trade:
+      = trade
+
 - if planting.child_seeds.size.positive?
   .index-cards
     - planting.child_seeds.each do |seed|
       = render 'seeds/card', seed: seed
 - else
   %p No seeds saved
-
-= planting_save_seeds_button(planting)
diff --git a/app/views/plantings/_facts.haml b/app/views/plantings/_facts.haml
index a6afb8122..4afd14ca7 100644
--- a/app/views/plantings/_facts.haml
+++ b/app/views/plantings/_facts.haml
@@ -7,43 +7,63 @@
           = seed_icon
       %span=planting.parent_seed
 
-  - if planting.finished?
-    .card.fact-card
+  - if planting.planted_at.present?
+    .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
       %h3 Planted
-      %strong=planting_icon
-      - if planting.quantity.present?
-        %span.plantingfact--quantity= planting.quantity
+      %strong.plantingfact--plantedmonth
+        = I18n.t('date.abbr_month_names')[planting.planted_at.month]
+      %span=planting.planted_at.year
 
-  - if planting.planted_at.present? && !planting.finished?
-    .card.fact-card
-      %h3 Planted
-      %strong.plantingfact--dayssinceplanted #{planting.days_since_planted}
-      %span days ago
-  - if planting.quantity.to_i.positive?
-    .card.fact-card
-      %h3 Quantity
-      %strong.plantingfact--quantity= planting.quantity
-      %span
-        - if planting.planted_from.present?
-          #{pluralize((planting.quantity.to_i), planting.planted_from)}
+  .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
+    %h3
+      Planted
+      = editable :date, planting, :planted_at, display_field: '.planted_at'
+    %strong.plantingfact--weekssinceplanted.planted_at
+      - if planting.planted_at.present?
+        #{planting.weeks_since_planted}
+      - else
+        unknown
+    %span.planted_at weeks ago
+    - if planting.planted_at.present?
+      %span.plantingfact--planttedat.planted_at
+        = I18n.l planting.planted_at
+
+
+
+  .card.fact-card{class: planting.quantity.present? ? '' : 'text-muted'}
+    %h3
+      Quantity
+      %small= editable :text_field, planting, :quantity, display_field: '.plantingfact--quantity'
+    %strong.plantingfact--quantity
+      - if planting.quantity.to_i.positive?
+        = planting.quantity
+      -else
+        unknown
+    %span
+      - if planting.quantity.to_i.positive? && planting.planted_from.present?
+        = planting.planted_from.pluralize(planting.quantity.to_i)
 
   - unless planting.finished?
     .card.fact-card.grid-sizer
       %h3 Growing
       %strong= seedling_icon
-      - if planting.planted_at.present?
-        %span.plantingfact--planttedat= I18n.l planting.planted_at.to_date
+      %span
+        Planting is still growing today
 
+  .card.fact-card{class: planting.planted_from.present? ? '' : 'text-muted'}
+    %h3
+      Grown from
+      = editable :select, planting, :planted_from, collection: Planting::PLANTED_FROM_VALUES, display_field: '.plantingfact--plantedfrom'
+    %strong.plantingfact--plantedfrom
+      = planting.planted_from.present? ? planting.planted_from : 'unknown'
 
-  - if planting.planted_from.present?
-    .card.fact-card
-      %h3 Grown from
-      %span.plantingfact--plantedfrom=planting.planted_from
-
-  .card.fact-card
-    %h3 Grown in
+  .card.fact-card{class: planting.sunniness.present? ? '' : 'text-muted'}
+    %h3
+      Grown in
+      = editable :select, planting, :sunniness, collection: Planting::SUNNINESS_VALUES, display_field: '.plantingfact--sunniness'
     %strong= sunniness_icon(planting.sunniness)
-    %span.plantingfact--sunniness= planting.sunniness.blank? ? "not specified" : planting.sunniness
+    %span.plantingfact--sunniness
+      = planting.sunniness.blank? ? "not specified" : planting.sunniness
 
   .card.fact-card
     %h3.plantingfact--harveststitle
@@ -51,8 +71,9 @@
     %strong
       = link_to planting_harvests_path(planting) do
         = harvest_icon
-    %span.plantingfact--harvestprediction
-      = planting.first_harvest_date&.to_formatted_s(:rfc822) || planting&.first_harvest_predicted_at&.to_formatted_s(:rfc822) || 'unknown'
+    - if planting.first_harvest_date.present? ||  planting.first_harvest_predicted_at.present?
+      %span.plantingfact--harvestprediction
+        = I18n.l(planting.first_harvest_date || planting&.first_harvest_predicted_at || 'unknown')
 
   - if planting.crop.perennial
     .card.fact-card
@@ -61,16 +82,20 @@
   - else
     - if !planting.finished? && planting.finish_is_predicatable?
       .card.fact-card
-        - days = days_from_now_to_finished(planting)
-        - if days.positive?
-          %h3.plantingfact--finishtitle Prediction
-          %strong.plantingfact--finisheddays #{days}
-          %span days until finished
+        %h3.plantingfact--finishtitle Predicted Finish
+        %strong.plantingfact--finishedmonth
+          = I18n.t('date.abbr_month_names')[planting.finish_predicted_at.month]
+        %span=planting.finish_predicted_at.year
+
+      .card.fact-card
+        %h3.plantingfact--finishtitle Predicted Finish
+        - if days_from_now_to_finished(planting).positive?
+          %strong.plantingfact--finisheddays= weeks_from_not_to_finished(planting)
+          %span weeks
         - else
-          %h3.plantingfact--finishtitle Finished
-          %strong.plantingfact--finisheddays #{days * -1}
-          %span days ago
-        %span= planting.finish_predicted_at&.to_formatted_s(:rfc822)
+          %strong.plantingfact--finisheddays #{weeks_from_not_to_finished(planting) * -1}
+          %span weeks ago
+        %span= I18n.l planting.finish_predicted_at
 
   - if planting.child_seeds.size.positive?
     .card.fact-card
@@ -84,5 +109,7 @@
     .card.fact-card
       %h3 Finished
       %strong=finished_icon
-      %span.plantingfact--finish=planting.finished_at&.to_formatted_s(:rfc822)
-
+      - if planting.finished_at.present?
+        %span.plantingfact--finish
+          = I18n.t('date.abbr_month_names')[planting.finished_at.month]
+          = planting.finished_at.year
diff --git a/app/views/plantings/_harvests.html.haml b/app/views/plantings/_harvests.html.haml
index ec3933ef1..aa3a0fd40 100644
--- a/app/views/plantings/_harvests.html.haml
+++ b/app/views/plantings/_harvests.html.haml
@@ -1,4 +1,15 @@
 %h2 Harvests
+
+- if can? :edit, @planting
+  %a.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :href => "#", :role => "button"}
+    = harvest_icon
+    Record harvest
+
+  .dropdown-menu.dropdown-secondary
+    - PlantPart.all.each do |plant_part|
+      = link_to harvests_path(return: 'planting', harvest: {crop_id: @planting.crop_id, planting_id: @planting.id, plant_part_id: plant_part.id}), method: :post, class: 'dropdown-item' do
+        = plant_part.name
+
 - if planting.harvests.empty?
   %p No harvests recorded
   - if !planting.finished? && can?(:edit, planting) && can?(:create, Harvest)
@@ -6,6 +17,4 @@
 - else
   .index-cards
     - planting.harvests.order(created_at: :desc).includes(:crop).each do |harvest|
-      = render 'harvests/card', harvest: harvest
-
-= planting_harvest_button(planting)
+      = render 'harvests/thumbnail', harvest: harvest
diff --git a/app/views/plantings/_photos.haml b/app/views/plantings/_photos.haml
index f27f2864d..800b42828 100644
--- a/app/views/plantings/_photos.haml
+++ b/app/views/plantings/_photos.haml
@@ -4,7 +4,9 @@
   - if can?(:edit, planting) && can?(:create, Photo)
     %p.text-right= add_photo_button(planting)
   %p.text-right
-    = link_to 'more photos', planting_photos_path(planting), class: 'btn'
+    = link_to planting_photos_path(planting), class: 'btn' do
+      = photo_icon
+      more photos
 - else
   %p No photos.
   - if can?(:edit, planting) && can?(:create, Photo)
diff --git a/app/views/plantings/_progress.html.haml b/app/views/plantings/_progress.html.haml
index a26fa646a..a61233f3e 100644
--- a/app/views/plantings/_progress.html.haml
+++ b/app/views/plantings/_progress.html.haml
@@ -1,8 +1,11 @@
-- if planting.annual? && planting.percentage_grown.present?
+- if planting.active? && planting.annual? && planting.percentage_grown.present?
   .progress
-    .progress-bar.bg-success{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => planting.percentage_grown, :role => "progressbar", :style => "width: #{planting.percentage_grown}%; height: 25px"}
+    .progress-bar.bg-success{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => planting.percentage_grown, role: "progressbar", style: "width: #{planting.percentage_grown}%"}
 
   .float-left #{sprintf '%.0f', planting.percentage_grown}%
 
   - unless planting.finish_predicted_at.blank?
-    .float-right= planting.finish_predicted_at.strftime(Date::DATE_FORMATS[:ymd])
+    .float-right
+      -# = planting.finish_predicted_at.strftime(Date::DATE_FORMATS[:ymd])
+      = I18n.t('date.abbr_month_names')[planting.finish_predicted_at.month]
+      = planting.finish_predicted_at.year
diff --git a/app/views/plantings/_progress_list.haml b/app/views/plantings/_progress_list.haml
new file mode 100644
index 000000000..79e9f0246
--- /dev/null
+++ b/app/views/plantings/_progress_list.haml
@@ -0,0 +1,15 @@
+- plantings.includes(:crop).annual.order("crops.name").each_with_index do |planting, i|
+  - if i.positive?
+    %hr/
+  .row.progress-row
+    .col-6.col-md-4.progress-row--crop
+      = render 'plantings/tiny', planting: planting
+      = render 'plantings/badges', planting: planting
+    .col-6.col-md-6.progress-row--bar
+      - if planting.planted_at.blank?
+        %small set "planted" date to allow predictions
+      - elsif planting.percentage_grown.blank?
+        %small not enough data on #{planting.crop} to predict
+      - else
+        = render 'plantings/progress', planting: planting
+    .col-12.col-md-2= render 'plantings/quick_actions', planting: planting
diff --git a/app/views/plantings/_quick_actions.haml b/app/views/plantings/_quick_actions.haml
index a2e4c6fac..61d173ef2 100644
--- a/app/views/plantings/_quick_actions.haml
+++ b/app/views/plantings/_quick_actions.haml
@@ -1,16 +1,14 @@
 - if can?(:edit, planting)
-  .planting-quick-actions.text-right
-    %a.btn#actionsMenu.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#"}
-      -# =icon('fas', 'ellipsis-v')
-    %ul.dropdown-menu.dropdown-menu-left{"aria-labelledby" => "actionsMenu"}
-      %li.btn-xs
-        = link_to t('view'), planting, class: 'btn'
-      %li.btn-xs= planting_edit_button(planting)
-      %li.btn-xs= add_photo_button(planting)
+  %a#planting-actions-menu.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#"}
+    /=icon('fas', 'ellipsis-v')
+  %ul.dropdown-menu.dropdown-menu-left{"aria-labelledby" => "planting-actions-menu"}
+    %li= link_to t('view'), planting, class: 'dropdown-item'
+    %li= planting_edit_button(planting, classes: 'dropdown-item')
+    %li= add_photo_button(planting, classes: 'dropdown-item')
 
-      - if planting.active?
-        %li.btn-xs= planting_finish_button(planting)
-        %li.btn-xs= planting_harvest_button(planting)
-        %li.btn-xs= planting_save_seeds_button(planting)
+    - if planting.active?
+      %li= planting_finish_button(planting, classes: 'dropdown-item')
+      %li= planting_harvest_button(planting, classes: 'dropdown-item')
+      %li= planting_save_seeds_button(planting, classes: 'dropdown-item')
 
 
diff --git a/app/views/plantings/_tiny.html.haml b/app/views/plantings/_tiny.html.haml
new file mode 100644
index 000000000..ccffd765a
--- /dev/null
+++ b/app/views/plantings/_tiny.html.haml
@@ -0,0 +1,4 @@
+= link_to planting do
+  .chip.crop-chip
+    = crop_icon(planting.crop)
+    = planting.crop.name
diff --git a/app/views/plantings/index.html.haml b/app/views/plantings/index.html.haml
index 407a97b41..6e5f53ffe 100644
--- a/app/views/plantings/index.html.haml
+++ b/app/views/plantings/index.html.haml
@@ -11,32 +11,32 @@
   = planting_icon
   = title('plantings', @owner, @crop, @planting)
 
-= render 'layouts/nav', model: Planting
-
-
-%section.border-top
-  .btn-group
-    = link_to plantings_active_tickbox_path(@owner, @show_all), class: 'btn' do
-      = check_box_tag 'active', 'all', @show_all
-      include in-active
-
-    - if @owner
-      = link_to t('.view_owners_profile', owner: @owner), member_path(@owner), class: 'btn'
+.row
+  .col
+    %ul.nav
+      %li.list-group-item
+        = link_to show_inactive_tickbox_path('plantings', owner: @owner, show_all: @show_all) do
+          = check_box_tag 'active', 'all', @show_all
+          include finished
+      - if @owner
+        %li.list-group-item.btn
+          = link_to t('.view_owners_profile', owner: @owner), member_path(@owner)
+  .col= render 'layouts/nav', model: Planting
 
 .row
   .col-12= page_entries_info @plantings
-  .col-12= render 'layouts/pagination', collection: @plantings
+  .col-12= will_paginate @plantings
 
 .index-cards
   - @plantings.each do |planting|
     = render planting, full: true
 
-.row
-  .col-12= page_entries_info @plantings
-  .col-12= render 'layouts/pagination', collection: @plantings
+= will_paginate @plantings
+
+%hr/
 
 %section.open-data
-  %h5= t('label.data')
+  %h3= t('label.data')
   %ul.nav#open-data
     - ['csv', 'json', 'rss'].each do |format|
       %li.list-group-item
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index f173b2ba4..a736dcb67 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -20,13 +20,14 @@
       %h1.plantingtitle
         %span.plantingtitle--icon= planting_icon
         = @planting.to_s.titleize
-
+    .col-md-4.col-xs-12
       = render 'plantings/actions', planting: @planting
 
+    .col-md-8.col-xs-12
       %section= render 'facts', planting: @planting
-
       - if @planting.description.present?
         %hr/
+        = cute_icon
         .card
           .card-header
             %h2 Notes
@@ -36,7 +37,8 @@
       %section= render 'plantings/photos', photos: @photos, planting: @planting
     .col-md-4.col-xs-12
       - if @planting.percentage_grown
-        .card
+        %section.progress-bar
+          %h2 Progress
           .progress
             .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
           %strong.plantingfact--percentagegrown
@@ -46,6 +48,10 @@
       = render @planting.crop
   .row
     .col-md-6
-      %section= render 'plantings/harvests', planting: @planting
+      %section.harvests
+        %a{name: 'harvests'}
+        = render 'plantings/harvests', planting: @planting
     .col-md-6
-      %section= render 'plantings/descendants', planting: @planting
+      %section.descendants
+        %a{name: 'seeds'}
+        = render 'plantings/descendants', planting: @planting
diff --git a/app/views/posts/_single.html.haml b/app/views/posts/_single.html.haml
index 0057e7367..10a372b6d 100644
--- a/app/views/posts/_single.html.haml
+++ b/app/views/posts/_single.html.haml
@@ -17,32 +17,3 @@
 
 :growstuff_markdown
   #{ strip_tags @post.body }
-
--# .card
--#   .post{ id: "post-#{post.id}" }
--#     .row
--#       .col-md-1
--#         = render partial: "members/avatar", locals: { member: post.author }
--#       .col-md-11
--#         - if defined?(subject)
--#           %h3= link_to strip_tags(post.subject), post
-
--#         .post-meta
--#           %p
--#             Posted by
--#             - if post.author
--#               = link_to post.author.login_name, member_path(post.author)
--#             - else
--#               Member Deleted
--#             - if post.forum
--#               in
--#               = link_to post.forum, post.forum
--#             on
--#             = post.created_at
--#             - if post.updated_at > post.created_at
--#               and edited at
--#               = post.updated_at
-
--#         .post-body
--#           :growstuff_markdown
--#             #{ strip_tags post.body }
diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml
index f7d09a620..efa29e670 100644
--- a/app/views/posts/show.html.haml
+++ b/app/views/posts/show.html.haml
@@ -56,11 +56,11 @@
 
   .col-md-4.col-12
     = render @post.author
-    - unless @post.crops.empty?
+    - unless @post.crops.approved.empty?
       %section.crops
         %h2 Crops mentioned in this post
         .index-cards
-          - @post.crops.each do |c|
+          - @post.crops.approved.each do |c|
             = render 'crops/thumbnail', crop: c
 
 
diff --git a/app/views/scientific_names/_form.html.haml b/app/views/scientific_names/_form.html.haml
index 95178f068..95f768aa7 100644
--- a/app/views/scientific_names/_form.html.haml
+++ b/app/views/scientific_names/_form.html.haml
@@ -17,7 +17,7 @@
   .form-group
     = f.label :crop_id, class: 'control-label col-md-2'
     .col-md-8
-      = collection_select(:scientific_name, :crop_id, Crop.all, :id,
+      = collection_select(:scientific_name, :crop_id, Crop.all.order(:name), :id,
         :name, { selected: @scientific_name.crop_id || @crop.id },
         class: 'form-control')
   .form-group
diff --git a/app/views/seeds/_card.html.haml b/app/views/seeds/_card.html.haml
index a6a975ef2..45164e45b 100644
--- a/app/views/seeds/_card.html.haml
+++ b/app/views/seeds/_card.html.haml
@@ -1,12 +1,12 @@
-.card.seed-card
+.card.seed-card{class: seed.active? ? '' : 'card-finished'}
   = link_to seed do
     = image_tag(seed_image_path(seed), alt: seed, class: 'img-card')
+  .text
+    = render 'members/tiny', member: seed.owner
   .card-body
     .card-title
       = crop_icon(seed.crop)
       = link_to seed.crop, seed
-  .card-footer
-    = render 'members/tiny', member: seed.owner
     - if seed.tradable?
       .text-muted
         = icon 'fas', 'map'
diff --git a/app/views/seeds/_facts.html.haml b/app/views/seeds/_facts.html.haml
index 51e19212c..ea155b123 100644
--- a/app/views/seeds/_facts.html.haml
+++ b/app/views/seeds/_facts.html.haml
@@ -1,24 +1,36 @@
 .index-cards.facts.seedfacts
-  .card
-    %h3 Quantity
+  .card{class: seed.quantity.present? ? '' : 'text-muted'}
+    %h3
+      Quantity
+      = editable :text_field, seed, :quantity, display_field: '.seedfacts--quantity'
     %strong.seedfacts--quantity= seed.quantity.blank? ? "not specified" : seed.quantity
-    %span seeds
+    %span
+      seeds
 
-  - if seed.plant_before.present?
-    .card.seedfacts--card
-      %h3 Plant before
-      %strong.seedfacts--plantbefore= I18n.l(seed.plant_before)
+  .card.seedfacts--card{class: seed.plant_before.present? ? '' : 'text-muted'}
+    %h3
+      Plant before
+      = editable :date, seed, :plant_before, display_field: '.seedfacts--plantbefore'
+    %strong.seedfacts--plantbefore
+      - if seed.plant_before.present?
+        = I18n.l(seed.plant_before)
+      - else
+        Unknown
 
   -if seed.finished_at.present?
     .card
       %h3 Finished at
-      %strong.seedfacts--finishedat= I18n.l(seed.finished_at)
-  .card
+
+  .card{class: seed.days_until_maturity_max.present? ? '' : 'text-muted'}
     %h3 Days until maturity
-    %strong.seedfacts--maturity= render partial: 'days_until_maturity', locals: { seed: seed }
+    %strong.seedfacts--maturity
+      = render partial: 'days_until_maturity', locals: { seed: seed }
+    %span days
 
   .card
-    %h3 Will trade
+    %h3
+      Will trade
+      = editable :select, seed, :tradable_to, collection: Seed::TRADABLE_TO_VALUES, display_field: '.seedfacts--tradableto'
     %strong.seedfacts--tradableto= seed.tradable_to
     %span
       - if seed.owner.location.blank?
diff --git a/app/views/seeds/_seed.haml b/app/views/seeds/_seed.haml
index af5f6203f..b6cd078e2 100644
--- a/app/views/seeds/_seed.haml
+++ b/app/views/seeds/_seed.haml
@@ -3,4 +3,4 @@
     = render 'seeds/card', seed: seed
 - else
   - cache seed do
-    = render 'seeds/thumbnail', seed: seed
\ No newline at end of file
+    = render 'seeds/thumbnail', seed: seed
diff --git a/app/views/seeds/index.html.haml b/app/views/seeds/index.html.haml
index 103fe7292..6c74b13d3 100644
--- a/app/views/seeds/index.html.haml
+++ b/app/views/seeds/index.html.haml
@@ -1,17 +1,3 @@
-- content_for :title, title('seeds', @owner, @crop, @planting)
-%h1
-  = seed_icon
-  = title('seeds', @owner, @crop, @planting)
-
-- if @owner
-  = link_to "View #{@owner}'s profile >>", member_path(@owner)
-
-%p
-  #{ENV['GROWSTUFF_SITE_NAME']} helps you track your seed
-  stash or trade seeds with other members.
-
-= render 'layouts/nav', model: Seed
-
 - content_for :breadcrumbs do
   - if @owner
     %li.breadcrumb-item= link_to 'Seeds', seeds_path
@@ -19,16 +5,32 @@
   - else
     %li.breadcrumb-item.active= link_to 'Seeds', seeds_path
 
+- content_for :title, title('seeds', @owner, @crop, @planting)
+%h1
+  = seed_icon
+  = title('seeds', @owner, @crop, @planting)
+
+.row
+  .col
+    %ul.nav
+      %li.list-group-item
+        = link_to show_inactive_tickbox_path('seeds', owner: @owner, show_all: @show_all) do
+          = check_box_tag 'active', 'all', @show_all
+          include finished
+      - if @owner
+        %li.list-group-item.btn
+          = link_to t('.view_owners_profile', owner: @owner), member_path(@owner)
+  .col= render 'layouts/nav', model: Seed
 
 - unless @seeds.empty?
-  .pagination
-    = page_entries_info @seeds
-    = will_paginate @seeds
-  .index-cards= render @seeds, full: true
+  = page_entries_info @seeds
+  = will_paginate @seeds
 
-  .pagination
-    = page_entries_info @seeds
-    = will_paginate @seeds
+  .index-cards
+    - @seeds.each do |seed|
+      = render 'seeds/card', seed: seed
+
+  = will_paginate @seeds
 
 %section.open-data
   %h5= t('label.data')
diff --git a/app/views/seeds/show.html.haml b/app/views/seeds/show.html.haml
index 7ada4e8d9..d2f2a717f 100644
--- a/app/views/seeds/show.html.haml
+++ b/app/views/seeds/show.html.haml
@@ -15,61 +15,66 @@
   %li.breadcrumb-item= link_to @seed.owner, member_seeds_path(@seed.owner)
   %li.breadcrumb-item.active= link_to @seed, @seed
 
-.row.seeds
-  .col-md-8
-    %h1
-      %span.seedtitle--icon= crop_icon(@seed.crop)
-      %strong
-        %span.seedtitle--owner #{@seed.owner}'s
-        %span.seedtitle--crop #{@seed.crop}
-        seeds
-      - if @seed.organic != 'unknown'
-        %small.seedtitle--organic= @seed.organic
-      - if @seed.gmo != 'unknown'
-        %small.seedtitle--gmo= @seed.gmo
-      - if @seed.heirloom != 'unknown'
-        %small.seedtitle--heirloom= @seed.heirloom
-      = I18n.l @seed.created_at.to_date
+.seed
+  .row
+    .col-md-8.col-xs-12
+      %h1
+        %span.seedtitle--icon= crop_icon(@seed.crop)
+        %strong
+          %span.seedtitle--owner #{@seed.owner}'s
+          %span.seedtitle--crop #{@seed.crop}
+          seeds
+        - if @seed.organic != 'unknown'
+          %small.seedtitle--organic= @seed.organic
+        - if @seed.gmo != 'unknown'
+          %small.seedtitle--gmo= @seed.gmo
+        - if @seed.heirloom != 'unknown'
+          %small.seedtitle--heirloom= @seed.heirloom
+        = I18n.l @seed.created_at.to_date
 
-    = render 'seeds/actions', seed: @seed
+    .col-md-4.col-xs-12
+      = render 'seeds/actions', seed: @seed
 
-    %section= render 'facts', seed: @seed
-    - if @seed.parent_planting
-      %dt Saved from planting:
-      %dd
-        = link_to @seed.parent_planting, planting_path(@seed.parent_planting)
-    - unless @seed.description.blank?
-      .card.seed--description
-        .card-header
-          %h2 Notes
-        .card-body
-          :growstuff_markdown
-            #{ @seed.description != "" ? strip_tags(@seed.description) : "No description given." }
+    .col-md-8.col-xs-12
+      %section= render 'facts', seed: @seed
+      - if @seed.parent_planting
+        %dt Saved from planting:
+        %dd
+          = link_to @seed.parent_planting, planting_path(@seed.parent_planting)
+      - unless @seed.description.blank?
+        = cute_icon
+        .card.seed--description
+          .card-header
+            %h2 Notes
+          .card-body
+            :growstuff_markdown
+              #{strip_tags(@seed.description)}
 
-    - if current_member
-      - if @seed.tradable? && current_member != @seed.owner
-        %p= link_to "Request seeds",
-                    new_message_path(recipient_id: @seed.owner.id,
-                                         subject: "Interested in your #{@seed.crop} seeds"),
-                    class: 'btn btn-primary'
-    - else
-      = render 'shared/signin_signup', to: 'request seeds'
+      - if current_member
+        - if @seed.tradable? && current_member != @seed.owner
+          %p= link_to "Request seeds",
+                      new_message_path(recipient_id: @seed.owner.id,
+                                           subject: "Interested in your #{@seed.crop} seeds"),
+                      class: 'btn btn-primary'
+      - else
+        = render 'shared/signin_signup', to: 'request seeds'
 
-    %section= render 'seeds/descendants', seed: @seed
-    %section.seed-photos
-      - @photos.each do |photo|
-        = render 'photos/hero', photo: photo
-    %p
-      %small
-        Or
-        = link_to "purchase seeds via Ebay",
-        crop_ebay_seeds_url(@seed.crop), target: "_blank", rel: "noopener noreferrer", class: 'btn'
-    - if @seed.owner.location
+      %section.plantings
+        = render 'seeds/descendants', seed: @seed
+      %section.seed-photos
+        - @photos.each do |photo|
+          = render 'photos/hero', photo: photo
       %p
         %small
-          View other seeds, members to trade with and more near
-          = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
-  .col-md-4
-    = render 'seeds/owner'
-    = render @seed.crop
+          Or
+          = link_to "purchase seeds via Ebay",
+          crop_ebay_seeds_url(@seed.crop), target: "_blank", rel: "noopener noreferrer", class: 'btn'
+      - if @seed.owner.location
+        %p
+          %small
+            View other seeds, members to trade with and more near
+            = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
+    .col-md-4.col-xs-12
+      = render 'seeds/owner'
+      = render @seed.crop
 
diff --git a/app/views/shared/_global_actions.html.haml b/app/views/shared/_global_actions.html.haml
deleted file mode 100644
index a40849af9..000000000
--- a/app/views/shared/_global_actions.html.haml
+++ /dev/null
@@ -1,25 +0,0 @@
-- if signed_in?
-  .btn-group
-    = link_to member_gardens_path(member_slug: current_member.slug),
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.my_gardens') do
-      = garden_icon
-
-    = link_to timeline_index_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.timeline') do
-      = timeline_icon
-
-    = link_to new_planting_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.new_planting') do
-      = planting_icon
-
-    = link_to new_harvest_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.new_harvest') do
-      = harvest_icon
-
-    = link_to new_seed_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.new_seeds') do
-      = seed_icon
-
-    = link_to new_post_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.new_post') do
-      = post_icon
diff --git a/app/views/shared/_signin_signup.html.haml b/app/views/shared/_signin_signup.html.haml
index 5fae2b0bd..51c7a5ac2 100644
--- a/app/views/shared/_signin_signup.html.haml
+++ b/app/views/shared/_signin_signup.html.haml
@@ -1,7 +1,6 @@
-%p
-  = link_to 'Sign in', new_member_session_path, class: 'btn btn-success'
-  or
-  = link_to 'sign up', new_member_registration_path, class: 'btn btn-info'
-  to
-  = succeed "." do
-    = to
+= link_to 'Sign in', new_member_session_path, class: 'btn btn-success'
+or
+= link_to 'sign up', new_member_registration_path, class: 'btn btn-info'
+to
+= succeed "." do
+  = to
diff --git a/app/views/shared/editable/_date.html.haml b/app/views/shared/editable/_date.html.haml
new file mode 100644
index 000000000..3e9fccfbb
--- /dev/null
+++ b/app/views/shared/editable/_date.html.haml
@@ -0,0 +1,11 @@
+- if can? :edit, model
+  %small.edit-link
+    %a.editable-date#description{"data-field" => "#date--#{model.id}-#{field.to_s}",
+      "data-display": display_field, href: "#"}
+      = edit_icon
+  .hide{id: "date--#{model.id}-#{field.to_s}"}
+    = bootstrap_form_for(model) do |f|
+      = f.text_field field,
+               value: model.send(field) ? model.send(field).to_s(:ymd) : '',
+               class: 'add-datepicker', label: 'When?'
+      = f.submit :save
diff --git a/app/views/shared/editable/_form.html.haml b/app/views/shared/editable/_form.html.haml
new file mode 100644
index 000000000..1c51efdae
--- /dev/null
+++ b/app/views/shared/editable/_form.html.haml
@@ -0,0 +1,18 @@
+- if can? :edit, model
+  %small.edit-link
+    %a.editable{"data-form" => "#form--#{model.id}-#{field.to_s}", "data-display": display_field, href: "#", name: "#form--#{model.id}-#{field.to_s}"}
+      = edit_icon
+
+  .hide{id: "form--#{model.id}-#{field.to_s}"}
+    = bootstrap_form_for(model) do |f|
+      - if field_type == :text_area
+        = f.text_area field
+      - elsif field_type == :text_field
+        = f.text_field field
+      - elsif field_type == :select
+        = f.select field, collection
+      - elsif field_type == :date
+        = f.text_field field,
+                 value: model.send(field) ? model.send(field).to_s(:ymd) : '',
+                 class: 'add-datepicker', label: 'When?'
+      = f.submit :save
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e14b1a037..5285d5569 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -206,7 +206,9 @@ en:
       number_plantings_linktext: "%{count} times"
   label:
     days_until_harvest: "%{number} days"
+    weeks_until_harvest: "%{number} weeks until harvest"
     days_until_finished: "%{number} days"
+    weeks_until_finished: "%{number} weeks"
     harvesting_now: harvesting now
     data: 'The data on this page is available in the following formats:'
   layouts:
@@ -226,6 +228,7 @@ en:
       gardens: Gardens
       harvest: Harvest
       harvests: Harvests
+      record: Record
       inbox: Inbox
       inbox_unread: Inbox (%{unread_count})
       plantings: Plantings
diff --git a/spec/controllers/charts/gardens_controller_spec.rb b/spec/controllers/charts/gardens_controller_spec.rb
index 1eb959b29..d264388f6 100644
--- a/spec/controllers/charts/gardens_controller_spec.rb
+++ b/spec/controllers/charts/gardens_controller_spec.rb
@@ -9,7 +9,7 @@ describe Charts::GardensController do
     describe 'GET timeline' do
       before { get :timeline, params: { garden_id: garden.to_param } }
 
-      it { expect(response).to be_success }
+      it { expect(response).to be_successful }
     end
   end
 
@@ -21,7 +21,7 @@ describe Charts::GardensController do
     describe 'GET timeline' do
       before { get :timeline, params: { garden_id: garden.to_param } }
 
-      it { expect(response).to be_success }
+      it { expect(response).to be_successful }
     end
   end
 end
diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb
index 057226c4a..2602673b0 100644
--- a/spec/features/crops/crop_detail_page_spec.rb
+++ b/spec/features/crops/crop_detail_page_spec.rb
@@ -1,6 +1,9 @@
 require 'rails_helper'
 
 describe "crop detail page", js: true do
+  before do
+    FactoryBot.create :plant_part, name: 'leaf'
+  end
   subject do
     # Update the medians after all the
     # data has been loaded
@@ -26,13 +29,16 @@ describe "crop detail page", js: true do
       before { subject }
 
       it "has a link to plant the crop" do
-        expect(page).to have_link "Plant #{crop.name}", href: new_planting_path(crop_id: crop.id)
+        click_link 'Add to garden'
+        expect(page).to have_link "add new garden"
       end
       it "has a link to harvest the crop" do
-        expect(page).to have_link "Harvest #{crop.name}", href: new_harvest_path(crop_id: crop.id)
+        click_link 'Record harvest'
+        expect(page).to have_link "leaf"
       end
       it "has a link to add seeds" do
-        expect(page).to have_link "Add #{crop.name} seeds to stash", href: new_seed_path(crop_id: crop.id)
+        click_link 'Save seeds'
+        expect(page).to have_link "Will trade: nowhere"
       end
     end
 
diff --git a/spec/features/gardens/index_spec.rb b/spec/features/gardens/index_spec.rb
index 526bba7c9..ba3d137d2 100644
--- a/spec/features/gardens/index_spec.rb
+++ b/spec/features/gardens/index_spec.rb
@@ -103,8 +103,7 @@ describe "Gardens#index", :js do
 
       it { expect(page).to have_link href: planting_path(planting) }
       it { expect(page).to have_link href: garden_path(planting.garden) }
-      it { expect(page).to have_text '50 days' }
-      it { expect(page).to have_text '90 days' }
+      it { expect(page).to have_text '7 weeks' }
       it { expect(page).not_to have_text 'harvesting now' }
     end
 
@@ -120,8 +119,7 @@ describe "Gardens#index", :js do
       it { expect(crop.median_lifespan).to eq 90 }
 
       it { expect(page).to have_text 'harvesting now' }
-      it { expect(page).to have_text '39 days' }
-      it { expect(page).not_to have_text 'Predicted days until harvest' }
+      it { expect(page).not_to have_text 'Predicted weeks until harvest' }
     end
 
     describe 'super late' do
@@ -133,8 +131,8 @@ describe "Gardens#index", :js do
 
       it { expect(page).to have_text 'super late' }
       it { expect(page).not_to have_text 'harvesting now' }
-      it { expect(page).not_to have_text 'Predicted days until harvest' }
-      it { expect(page).not_to have_text 'Predicted days until planting is finished' }
+      it { expect(page).not_to have_text 'Predicted weeks until harvest' }
+      it { expect(page).not_to have_text 'Predicted weeks until planting is finished' }
     end
   end
 end
diff --git a/spec/features/harvests/harvesting_a_crop_spec.rb b/spec/features/harvests/harvesting_a_crop_spec.rb
index e7aeea3d6..a3261525a 100644
--- a/spec/features/harvests/harvesting_a_crop_spec.rb
+++ b/spec/features/harvests/harvesting_a_crop_spec.rb
@@ -47,14 +47,8 @@ describe "Harvesting a crop", :js, :elasticsearch do
     describe "Harvesting from crop page" do
       before do
         visit crop_path(maize)
-        within '.crop-actions' do
-          click_link "Harvest #{maize.name}"
-        end
-        within "form#new_harvest" do
-          choose plant_part.name
-          expect(page).to have_selector "input[value='maize']"
-          click_button "Save"
-        end
+        click_link 'Record harvest'
+        click_link plant_part.name
       end
 
       it { expect(page).to have_content "harvest was successfully created." }
@@ -65,10 +59,8 @@ describe "Harvesting a crop", :js, :elasticsearch do
       let!(:planting) { create :planting, crop: maize, owner: member, garden: member.gardens.first }
       before do
         visit planting_path(planting)
-        click_link "Record Harvest"
-
-        choose plant_part.name
-        click_button "Save"
+        click_link "Record harvest"
+        click_link plant_part.name
       end
 
       it { expect(page).to have_content "harvest was successfully created." }
diff --git a/spec/features/plantings/planting_a_crop_spec.rb b/spec/features/plantings/planting_a_crop_spec.rb
index 5a262ecbb..b6eb4fe76 100644
--- a/spec/features/plantings/planting_a_crop_spec.rb
+++ b/spec/features/plantings/planting_a_crop_spec.rb
@@ -2,8 +2,8 @@ require "rails_helper"
 require 'custom_matchers'
 
 describe "Planting a crop", :js, :elasticsearch do
-  let!(:maize) { FactoryBot.create :maize                 }
-  let(:garden) { FactoryBot.create :garden, owner: member }
+  let!(:maize) { FactoryBot.create :maize }
+  let(:garden) { FactoryBot.create :garden, owner: member, name: 'Orchard' }
   let!(:planting) do
     FactoryBot.create :planting, garden: garden, owner: member, planted_at: Date.parse("2013-03-10")
   end
@@ -160,16 +160,8 @@ describe "Planting a crop", :js, :elasticsearch do
 
     it "Planting from crop page" do
       visit crop_path(maize)
-      within '.crop-actions' do
-        click_link "Plant maize"
-      end
-      within "form#new_planting" do
-        expect(page).to have_selector "input[value='maize']"
-      end
-
-      choose(member.gardens.first.name)
-      click_button "Save"
-
+      click_link "Add to garden"
+      click_link "Orchard"
       expect(page).to have_content "planting was successfully created"
       expect(page).to have_content "maize"
     end
@@ -224,7 +216,7 @@ describe "Planting a crop", :js, :elasticsearch do
       end
       expect(page).to have_content "planting was successfully created"
       expect(page).to have_content "Finished"
-      expect(page).to have_content "30 Aug"
+      expect(page).to have_content "Aug 2014"
 
       # shouldn't be on the page
       visit plantings_path
diff --git a/spec/features/plantings/show_spec.rb b/spec/features/plantings/show_spec.rb
index e9d39fca3..c2e01c0a4 100644
--- a/spec/features/plantings/show_spec.rb
+++ b/spec/features/plantings/show_spec.rb
@@ -22,10 +22,10 @@ describe "Display a planting", :js, :elasticsearch do
   end
 
   context 'Annual with predicted finish' do
-    let(:planting) { FactoryBot.create :predicatable_planting, planted_at: 1.day.ago }
-    it { expect(find('.plantingfact--dayssinceplanted')).to have_text '1' }
-    it { expect(find('.plantingfact--percentagegrown')).to have_text '2%' }
-    it { expect(find('.plantingfact--planttedat')).to have_text I18n.l(1.day.ago.to_date) }
+    let(:planting) { FactoryBot.create :predicatable_planting, planted_at: 2.weeks.ago }
+    it { expect(find('.plantingfact--weekssinceplanted')).to have_text '2' }
+    it { expect(find('.plantingfact--percentagegrown')).to have_text '28%' }
+    it { expect(find('.plantingfact--planttedat')).to have_text I18n.l(2.weeks.ago.to_date) }
     it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
   end
 
diff --git a/spec/features/seeds/adding_seeds_spec.rb b/spec/features/seeds/adding_seeds_spec.rb
index e2264eaa2..6ec0b1bd3 100644
--- a/spec/features/seeds/adding_seeds_spec.rb
+++ b/spec/features/seeds/adding_seeds_spec.rb
@@ -57,11 +57,8 @@ describe "Seeds", :js, :elasticsearch do
     describe "Adding a seed from crop page" do
       before do
         visit crop_path(maize)
-        click_link "Add maize seeds to stash"
-        within "form#new_seed" do
-          expect(page).to have_selector "input[value='maize']"
-          click_button "Save"
-        end
+        click_link "Save seeds"
+        click_link "Will trade: nowhere"
       end
 
       it { expect(page).to have_content "Successfully added maize seed to your stash" }
diff --git a/spec/features/seeds/misc_seeds_spec.rb b/spec/features/seeds/misc_seeds_spec.rb
index 53587ede5..a1d047daf 100644
--- a/spec/features/seeds/misc_seeds_spec.rb
+++ b/spec/features/seeds/misc_seeds_spec.rb
@@ -19,6 +19,7 @@ describe "seeds", js: true do
     describe "button on front page to add seeds" do
       before do
         visit root_path
+        click_link 'Record'
         click_link(href: new_seed_path)
       end
 
@@ -29,7 +30,7 @@ describe "seeds", js: true do
     describe "Clicking link to owner's profile" do
       before do
         visit member_seeds_path(member)
-        click_link "View #{member}'s profile >>"
+        click_link "View Owners Profile"
       end
 
       it { expect(current_path).to eq member_path(member) }
diff --git a/spec/features/shared_examples/append_date.rb b/spec/features/shared_examples/append_date.rb
index 8dc283c22..2680dac30 100644
--- a/spec/features/shared_examples/append_date.rb
+++ b/spec/features/shared_examples/append_date.rb
@@ -1,5 +1,6 @@
 shared_examples "append date" do
   let(:this_month) { Time.zone.today.strftime("%b") }
+  let(:this_year) { Time.zone.today.year }
 
   before { visit path }
 
@@ -13,7 +14,7 @@ shared_examples "append date" do
       end
     end
     it { expect(page).to have_content "Finished" }
-    it { expect(page).to have_content "21 #{this_month}" }
+    it { expect(page).to have_content "#{this_month} #{this_year}" }
   end
 
   describe "Confirming without selecting date" do
diff --git a/spec/views/photos/index.html.haml_spec.rb b/spec/views/photos/index.html.haml_spec.rb
index f3eae4739..ef058e822 100644
--- a/spec/views/photos/index.html.haml_spec.rb
+++ b/spec/views/photos/index.html.haml_spec.rb
@@ -17,6 +17,6 @@ describe "photos/index" do
   it "renders a gallery of photos" do
     render
     assert_select ".photo-card", count: 2
-    assert_select "img", count: 2
+    assert_select "img.img-card", count: 2
   end
 end

From 3422a0d899de55ef6674cb778f5d899622733d59 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 6 Oct 2019 14:19:39 +1300
Subject: [PATCH 053/142] Administer member's roles

---
 app/controllers/admin/members_controller.rb   | 13 ++++++++
 .../{ => admin}/roles_controller.rb           |  8 +++--
 app/models/role.rb                            |  1 +
 app/views/admin/index.html.haml               |  2 +-
 app/views/admin/members/_form.html.haml       | 14 +++++++++
 app/views/admin/members/edit.html.haml        |  3 ++
 app/views/admin/members/index.html.haml       | 11 ++++++-
 app/views/admin/roles/_form.html.haml         | 16 ++++++++++
 app/views/admin/roles/edit.html.haml          |  8 +++++
 app/views/admin/roles/index.html.haml         | 30 +++++++++++++++++++
 app/views/admin/roles/new.html.haml           | 11 +++++++
 app/views/roles/_form.html.haml               | 19 ------------
 app/views/roles/edit.html.haml                |  5 ----
 app/views/roles/index.html.haml               | 21 -------------
 app/views/roles/new.html.haml                 |  5 ----
 app/views/roles/show.html.haml                | 12 --------
 config/routes.rb                              |  7 +++--
 17 files changed, 117 insertions(+), 69 deletions(-)
 rename app/controllers/{ => admin}/roles_controller.rb (78%)
 create mode 100644 app/views/admin/members/_form.html.haml
 create mode 100644 app/views/admin/members/edit.html.haml
 create mode 100644 app/views/admin/roles/_form.html.haml
 create mode 100644 app/views/admin/roles/edit.html.haml
 create mode 100644 app/views/admin/roles/index.html.haml
 create mode 100644 app/views/admin/roles/new.html.haml
 delete mode 100644 app/views/roles/_form.html.haml
 delete mode 100644 app/views/roles/edit.html.haml
 delete mode 100644 app/views/roles/index.html.haml
 delete mode 100644 app/views/roles/new.html.haml
 delete mode 100644 app/views/roles/show.html.haml

diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index 483a3b699..31d85f643 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -1,6 +1,8 @@
 module Admin
   class MembersController < ApplicationController
     before_action :auth!
+    load_and_authorize_resource
+    respond_to :html
 
     def index
       @members = Member.all
@@ -14,6 +16,17 @@ module Admin
       redirect_to admin_members_path
     end
 
+    def edit
+      @member = Member.find_by!(slug: params[:slug])
+    end
+
+    def update
+      @member = Member.find_by!(slug: params[:slug])
+      @member.update(roles: Role.where(id: params.require(:member).require(:role_ids)))
+
+      respond_with @member, location: admin_members_path
+    end
+
     private
 
     def search_term
diff --git a/app/controllers/roles_controller.rb b/app/controllers/admin/roles_controller.rb
similarity index 78%
rename from app/controllers/roles_controller.rb
rename to app/controllers/admin/roles_controller.rb
index 6b43cf9da..5950cb165 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -1,3 +1,4 @@
+module Admin
 class RolesController < ApplicationController
   before_action :authenticate_member!
   load_and_authorize_resource
@@ -24,17 +25,17 @@ class RolesController < ApplicationController
 
   def create
     @role = Role.create(role_params)
-    respond_with @role
+    respond_with @role, location: admin_roles_path
   end
 
   def update
     @role.update(role_params)
-    respond_with @role
+    respond_with @role, location: admin_roles_path
   end
 
   def destroy
     @role.destroy
-    respond_with @role
+    respond_with @role, location: admin_roles_path
   end
 
   private
@@ -43,3 +44,4 @@ class RolesController < ApplicationController
     params.require(:role).permit(:description, :name, :members, :slug)
   end
 end
+end
\ No newline at end of file
diff --git a/app/models/role.rb b/app/models/role.rb
index 3606641ea..ea17cfb91 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,6 +1,7 @@
 class Role < ApplicationRecord
   extend FriendlyId
   friendly_id :name, use: %i(slugged finders)
+  validates :name, uniqueness: true, presence: true
 
   has_and_belongs_to_many :members # rubocop:disable Rails/HasAndBelongsToMany
 
diff --git a/app/views/admin/index.html.haml b/app/views/admin/index.html.haml
index a0a458c56..9a60bb324 100644
--- a/app/views/admin/index.html.haml
+++ b/app/views/admin/index.html.haml
@@ -14,7 +14,7 @@
           Site admin
       .card-body
         %nav.nav#site_admin
-          %li= link_to "Roles", roles_path, class: 'nav-link'
+          %li= link_to "Roles", admin_roles_path, class: 'nav-link'
           %li= link_to "Forums", forums_path, class: 'nav-link'
           %li= link_to "CMS", comfy_admin_cms_path, class: 'nav-link'
           %li= link_to t('.garden_types'), garden_types_path, class: 'nav-link'
diff --git a/app/views/admin/members/_form.html.haml b/app/views/admin/members/_form.html.haml
new file mode 100644
index 000000000..24c369576
--- /dev/null
+++ b/app/views/admin/members/_form.html.haml
@@ -0,0 +1,14 @@
+%section.card.form-card
+  = bootstrap_form_for [:admin, @member] do |f|
+    - if @member.errors.any?
+      #error_explanation
+        %h2
+          = pluralize(@member.errors.size, "error")
+          prohibited this role from being saved:
+        %ul
+          - @member.errors.full_messages.each do |msg|
+            %li= msg
+    .card-body
+      = f.collection_check_boxes(:role_ids, Role.all, :id, :name)
+    .card-footer
+      = f.submit 'Save', class: 'btn btn-success'
diff --git a/app/views/admin/members/edit.html.haml b/app/views/admin/members/edit.html.haml
new file mode 100644
index 000000000..944ef00c6
--- /dev/null
+++ b/app/views/admin/members/edit.html.haml
@@ -0,0 +1,3 @@
+.row
+  .col= render 'members/member', member: @member
+  .col= render 'form'
diff --git a/app/views/admin/members/index.html.haml b/app/views/admin/members/index.html.haml
index 0a8d440ad..5791ba65d 100644
--- a/app/views/admin/members/index.html.haml
+++ b/app/views/admin/members/index.html.haml
@@ -1,3 +1,7 @@
+- content_for :breadcrumbs do
+  %li.breadcrumb-item= link_to 'Admin', admin_path
+  %li.breadcrumb-item.active= link_to 'Members', admin_members_path
+
 .row
   .col-md-6
     = bootstrap_form_tag url: admin_members_path, method: :get, layout: :horizontal do |f|
@@ -7,7 +11,6 @@
         = f.text_field(:q, 'aria-label': 'search members', placeholder: 'search members', hide_label: true)
         = f.submit 'search', class: 'btn btn-secondary'
 
-
 %table.table.table-striped
   %thead
     %tr
@@ -20,6 +23,12 @@
       %td= member.login_name
       %td= member.email
       %td
+        %ul
+          - member.roles.pluck(:name).each do |r|
+            %li= r
+      %td
+        = link_to edit_admin_member_path(member), class: 'btn' do
+          = edit_icon
         = link_to admin_member_path(member), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-light text-danger' do
           = icon 'fas', 'ban'
           Ban member
diff --git a/app/views/admin/roles/_form.html.haml b/app/views/admin/roles/_form.html.haml
new file mode 100644
index 000000000..6188207dd
--- /dev/null
+++ b/app/views/admin/roles/_form.html.haml
@@ -0,0 +1,16 @@
+.form-page
+  %section.card.form-card
+    = bootstrap_form_for [:admin, @role] do |f|
+      - if @role.errors.any?
+        #error_explanation
+          %h2
+            = pluralize(@role.errors.size, "error")
+            prohibited this role from being saved:
+          %ul
+            - @role.errors.full_messages.each do |msg|
+              %li= msg
+      .card-body
+        = f.text_field :name
+        = f.text_area :description
+      .card-footer
+        = f.submit 'Save', class: 'btn btn-success'
diff --git a/app/views/admin/roles/edit.html.haml b/app/views/admin/roles/edit.html.haml
new file mode 100644
index 000000000..e98da7412
--- /dev/null
+++ b/app/views/admin/roles/edit.html.haml
@@ -0,0 +1,8 @@
+- content_for :title, "Editing role"
+- content_for :breadcrumbs do
+  %li.breadcrumb-item= link_to 'Admin', admin_path
+  %li.breadcrumb-item= link_to 'Roles', admin_roles_path
+  %li.breadcrumb-item.active= link_to 'Edit', edit_admin_role_path(@role)
+= render 'form'
+
+= link_to 'Back', admin_roles_path
diff --git a/app/views/admin/roles/index.html.haml b/app/views/admin/roles/index.html.haml
new file mode 100644
index 000000000..eced7a10d
--- /dev/null
+++ b/app/views/admin/roles/index.html.haml
@@ -0,0 +1,30 @@
+- content_for :title, "Listing roles"
+
+- content_for :breadcrumbs do
+  %li.breadcrumb-item= link_to 'Admin', admin_path
+  %li.breadcrumb-item.active= link_to 'Roles', admin_roles_path
+
+- if can? :create, Role
+  %p= link_to 'New Role', new_admin_role_path, class: 'btn btn-primary'
+
+%table.table.table-striped
+  %thead
+    %tr
+      %th Name
+      %th Description
+      %th
+      %th
+
+  - @roles.each do |role|
+    %tr
+      %td= role.name
+      %td= role.description
+      %td
+        - if can? :edit, role
+          = link_to edit_admin_role_path(role), class: 'btn btn-default btn-xs' do 
+            = edit_icon
+            = t('.edit')
+        - if can?(:destroy, role) && ! role.members.any?
+          = link_to admin_role_path(role), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs text-danger' do
+            = delete_icon
+            = t('.delete')
diff --git a/app/views/admin/roles/new.html.haml b/app/views/admin/roles/new.html.haml
new file mode 100644
index 000000000..1b0e660aa
--- /dev/null
+++ b/app/views/admin/roles/new.html.haml
@@ -0,0 +1,11 @@
+- content_for :title, "New role"
+
+
+- content_for :breadcrumbs do
+  %li.breadcrumb-item= link_to 'Admin', admin_path
+  %li.breadcrumb-item= link_to 'Roles', admin_roles_path
+  %li.breadcrumb-item.active= link_to 'New', new_admin_role_path
+
+= render 'form'
+
+= link_to 'Back', admin_roles_path
diff --git a/app/views/roles/_form.html.haml b/app/views/roles/_form.html.haml
deleted file mode 100644
index 67393b833..000000000
--- a/app/views/roles/_form.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-= form_for @role do |f|
-  .row
-    - if @role.errors.any?
-      #error_explanation
-        %h2
-          = pluralize(@role.errors.size, "error")
-          prohibited this role from being saved:
-        %ul
-          - @role.errors.full_messages.each do |msg|
-            %li= msg
-
-  .field
-    .col-md2= f.label :name
-    .col-md10= f.text_field :name
-  .field
-    .col-md2= f.label :description
-    .col-md10= f.text_area :description
-  .actions
-    = f.submit 'Save', class: 'btn btn-default'
diff --git a/app/views/roles/edit.html.haml b/app/views/roles/edit.html.haml
deleted file mode 100644
index f0864018c..000000000
--- a/app/views/roles/edit.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-- content_for :title, "Editing role"
-
-= render 'form'
-
-= link_to 'Back', roles_path
diff --git a/app/views/roles/index.html.haml b/app/views/roles/index.html.haml
deleted file mode 100644
index 9a19a7959..000000000
--- a/app/views/roles/index.html.haml
+++ /dev/null
@@ -1,21 +0,0 @@
-- content_for :title, "Listing roles"
-
-- if can? :create, Role
-  %p= link_to 'New Role', new_role_path, class: 'btn btn-primary'
-
-%table.table.table-striped
-  %tr
-    %th Name
-    %th Description
-    %th
-    %th
-
-  - @roles.each do |role|
-    %tr
-      %td= role.name
-      %td= role.description
-      - if can? :edit, role
-        %td= link_to 'Edit', edit_role_path(role), class: 'btn btn-default btn-xs'
-      - if can? :destroy, role
-        %td= link_to 'Delete', role, method: :delete,
-            data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs'
diff --git a/app/views/roles/new.html.haml b/app/views/roles/new.html.haml
deleted file mode 100644
index 30aae3fe1..000000000
--- a/app/views/roles/new.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-- content_for :title, "New role"
-
-= render 'form'
-
-= link_to 'Back', roles_path
diff --git a/app/views/roles/show.html.haml b/app/views/roles/show.html.haml
deleted file mode 100644
index 54d229012..000000000
--- a/app/views/roles/show.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%p#notice= notice
-
-%p
-  %b Name:
-  = @role.name
-%p
-  %b Description:
-  = @role.description
-
-= link_to 'Edit', edit_role_path(@role), class: 'btn btn-default btn-xs'
-\|
-= link_to 'Back', roles_path
diff --git a/config/routes.rb b/config/routes.rb
index 334bf106c..2ab16b578 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -80,7 +80,6 @@ Rails.application.routes.draw do
   end
 
   resources :comments
-  resources :roles
   resources :forums
 
   resources :follows, only: %i(create destroy)
@@ -109,12 +108,16 @@ Rails.application.routes.draw do
   get 'members/auth/:provider/callback' => 'authentications#create'
 
   scope :admin do
-    resources :members, param: :slug, controller: 'admin/members', as: 'admin_members'
     get '/' => 'admin#index', as: 'admin'
     get '/newsletter' => 'admin#newsletter', as: 'admin_newsletter'
     comfy_route :cms_admin, path: '/cms'
   end
 
+  namespace :admin do
+    resources :members, param: :slug
+    resources :roles
+  end
+
   namespace :api do
     namespace :v1 do
       jsonapi_resources :photos

From d39dc65c4eaecdf219ec6f796b10a200328210b8 Mon Sep 17 00:00:00 2001
From: bestest-mensch <16200338+bestest-mensch@users.noreply.github.com>
Date: Sat, 5 Oct 2019 22:06:22 -0500
Subject: [PATCH 054/142] small ui tweak

---
 app/views/gardens/show.html.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index ae51892fa..9384e088a 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -69,7 +69,8 @@
           - @finished_plantings.each do |planting|
             = render "plantings/thumbnail",  planting: planting
         - else
-          %p Nothing has been planted here.
+          .col-md-12
+            %p Nothing has been planted here.
   .col-md-3
     .card
       .card-image

From 01df35e5a656101527ca92450d971216a2863f69 Mon Sep 17 00:00:00 2001
From: bestest-mensch <16200338+bestest-mensch@users.noreply.github.com>
Date: Sat, 5 Oct 2019 22:18:21 -0500
Subject: [PATCH 055/142] update contributors

---
 CONTRIBUTORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 01aeaaba7..1e308c839 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -88,6 +88,7 @@ submit the change with your pull request.
 - Ahmed Shahin / [codeminator](https://www.github.com/codeminator)
 - Brandon Baker / [brandonbaker40](https://github.com/brandonbaker40)
 - Alex Darr / [apdarr](https://github.com/apdarr)
+- Taylor William / [bestest-mensch](https://github.com/bestest-mensch)
 
 ## Bots
 

From 80fb4f5fe6a1a8f5ab1478a432afbd5305691e3f Mon Sep 17 00:00:00 2001
From: bestest-mensch <16200338+bestest-mensch@users.noreply.github.com>
Date: Sat, 5 Oct 2019 21:23:37 -0500
Subject: [PATCH 056/142] add ability to delete multiple conversations at once

---
 app/controllers/conversations_controller.rb |   7 ++
 app/views/conversations/index.haml          | 105 ++++++++++----------
 config/routes.rb                            |   6 +-
 spec/features/conversations/index_spec.rb   |   4 +-
 4 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index 67cf92211..52b92a59a 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -33,6 +33,13 @@ class ConversationsController < ApplicationController
     redirect_to conversations_path(box: params[:box])
   end
 
+  def destroy_multiple
+    Mailboxer::Conversation.where(id: params[:conversation_ids]).each do |conversation|
+      conversation.move_to_trash(current_member)
+    end
+    redirect_to conversations_path(box: params[:box])
+  end
+
   private
 
   def mailbox
diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index 81f38c125..550ecf9b7 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -3,55 +3,58 @@
   %li.breadcrumb-item= link_to 'Conversations', conversations_path
   %li.breadcrumb-item.active= link_to @box, conversations_path(box: @box)
 
-.row
-  .col-md-2
-  .col-md-10
-    %h1= @box
-    - unless @conversations.empty?
-      = will_paginate @conversations
-.row
-  .col-md-2.list-group
-    - @boxes.each do |box_name, counts|
-      = link_to conversations_path(box: box_name), class: "nav-link list-group-item d-flex justify-content-between #{box_name == @box ? 'active' : ''} #{box_name}" do
-        - if counts['unread'].positive?
-          %span.badge.badge-info=counts['unread']
-        - else
-          %span
-        %span
-          = icon 'fas', box_name
-          = box_name
+= form_tag destroy_multiple_conversations_path, method: :delete do
+  .row.py-4
+    .col-2.offset-md-2
+      %h1= @box
+    .col-8
+      = button_tag(type: 'submit', class: 'btn btn-default') do
+        = icon 'fas', 'trash-alt'
+        = 'Delete Selected'
 
-  .col-md-10
-    .list-group
-      - @conversations.each do |conversation|
-        .list-group-item
-          .row
-            .col-md-1
-              - if conversation.receipts_for(current_member).last.is_unread?
-                %h1= icon 'far', 'envelope'
-              - else
-                %h1.text-muted= icon 'far', 'envelope-open'
-            .col-md-10
-              .text-right.float-right
-                - conversation.recipients.each do |member|
-                  - if member != current_member
-                    = render 'members/tiny', member: member
-              = link_to conversation_path(conversation) do
-                .conversation
-                  %h5.mb-2.h5
-                    - if conversation.receipts_for(current_member).last.is_unread?
-                      %strong= conversation.subject
-                    - else
-                      = conversation.subject
-                    %small
-                      #{time_ago_in_words conversation.messages.last.created_at} ago
-                      %span.text-muted= conversation.messages.last.created_at
-                  = truncate(strip_tags(conversation.messages.last.body), length: 150, separator: ' ', omission: '... ')
-            .col-md-1
-              - if @box == 'trash'
-                = link_to conversation_path(conversation, box: @box), method: :put, class: 'restore' do
-                  = icon 'fas', 'trash-restore'
-              - else
-                = link_to delete_icon, conversation_path(conversation, box: @box), method: :delete, class: 'delete text-danger'
-    - unless @conversations.empty?
-      = will_paginate @conversations
+  .row
+    .col-md-2.py-4
+      - @boxes.each do |box_name, counts|
+        = link_to conversations_path(box: box_name), class: "nav-link list-group-item d-flex justify-content-between #{box_name == @box ? 'active' : ''} #{box_name}" do
+          - if counts['unread'].positive?
+            %span.badge.badge-info=counts['unread']
+          - else
+            %span
+          %span
+            = icon 'fas', box_name
+            = box_name
+
+    .col-md-10
+      .list-group
+        - @conversations.each do |conversation|
+          .list-group-item
+            .row
+              .col-md-1
+                - if conversation.receipts_for(current_member).last.is_unread?
+                  %h1= icon 'far', 'envelope'
+                - else
+                  %h1.text-muted= icon 'far', 'envelope-open'
+              .col-md-10
+                .text-right.float-right
+                  - conversation.recipients.each do |member|
+                    - if member != current_member
+                      = render 'members/tiny', member: member
+                = link_to conversation_path(conversation) do
+                  .conversation
+                    %h5.mb-2.h5
+                      - if conversation.receipts_for(current_member).last.is_unread?
+                        %strong= conversation.subject
+                      - else
+                        = conversation.subject
+                      %small
+                        #{time_ago_in_words conversation.messages.last.created_at} ago
+                        %span.text-muted= conversation.messages.last.created_at
+                    = truncate(strip_tags(conversation.messages.last.body), length: 150, separator: ' ', omission: '... ')
+              .col-md-1
+                - if @box == 'trash'
+                  = link_to conversation_path(conversation, box: @box), method: :put, class: 'restore' do
+                    = icon 'fas', 'trash-restore'
+                - else
+                  = check_box_tag 'conversation_ids[]', conversation.id, false, class: 'selectable'
+      - unless @conversations.empty?
+        = will_paginate @conversations
diff --git a/config/routes.rb b/config/routes.rb
index 334bf106c..1caa9ebe5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -99,7 +99,11 @@ Rails.application.routes.draw do
   end
 
   resources :messages
-  resources :conversations
+  resources :conversations do
+    collection do
+      delete 'destroy_multiple'
+    end
+  end
 
   resources :places, only: %i(index show), param: :place do
     get 'search', on: :collection
diff --git a/spec/features/conversations/index_spec.rb b/spec/features/conversations/index_spec.rb
index 850e42236..8c13ad6ee 100644
--- a/spec/features/conversations/index_spec.rb
+++ b/spec/features/conversations/index_spec.rb
@@ -20,8 +20,8 @@ describe "Conversations", :js do
 
     describe 'deleting' do
       before do
-        # delete button
-        click_link class: 'delete'
+        check 'conversation_ids[]'
+        click_button 'Delete Selected'
       end
 
       describe 'view trash' do

From 9f8e2e65be7af76391dff200fe00b603a35828e1 Mon Sep 17 00:00:00 2001
From: bestest-mensch <16200338+bestest-mensch@users.noreply.github.com>
Date: Sun, 6 Oct 2019 16:12:46 -0500
Subject: [PATCH 057/142] update/add specs

---
 spec/features/conversations/index_spec.rb | 43 ++++++++++++++++
 spec/rails_helper.rb                      |  1 +
 spec/requests/conversations_spec.rb       | 62 +++++++++++++++++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 spec/requests/conversations_spec.rb

diff --git a/spec/features/conversations/index_spec.rb b/spec/features/conversations/index_spec.rb
index 8c13ad6ee..1746a314c 100644
--- a/spec/features/conversations/index_spec.rb
+++ b/spec/features/conversations/index_spec.rb
@@ -39,4 +39,47 @@ describe "Conversations", :js do
       end
     end
   end
+
+  describe 'deleting conversations' do
+    it 'deletes multiple conversations from the inbox' do
+      sender.send_message(recipient, 'this is a message', 'message 1')
+      sender.send_message(recipient, 'this is another message', 'follow up message')
+
+      visit root_path
+      click_link 'Your Stuff'
+      click_link 'Inbox'
+
+      all('input[type=checkbox]').each do |checkbox|
+        checkbox.click
+      end
+
+      click_button 'Delete Selected'
+
+      expect(page).not_to have_content 'this is a message'
+      expect(page).not_to have_content 'this is another message'
+    end
+
+    it 'deletes multiple conversations from the sentbox' do
+      sender.send_message(recipient, 'this is a message', 'message 1')
+      sender.send_message(recipient, 'this is another message', 'follow up message')
+
+      visit root_path
+      click_link 'Your Stuff'
+      click_link 'Inbox'
+
+      expect(page).to have_selector('.sent')
+      find('.sent').click
+
+      all('input[type=checkbox]').each do |checkbox|
+        checkbox.click
+      end
+
+      click_button 'Delete Selected'
+
+      expect(page).to have_selector('.sent')
+      find('.sent').click
+      expect(page).not_to have_content 'this is a message'
+      expect(page).not_to have_content 'this is another message'
+    end
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c5dbe582b..d780aedb2 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -96,6 +96,7 @@ RSpec.configure do |config|
   # controller specs require this to work with Devise
   # see https://github.com/plataformatec/devise/wiki/How-To%3a-Controllers-and-Views-tests-with-Rails-3-%28and-rspec%29
   config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Devise::Test::IntegrationHelpers, type: :request
   config.extend ControllerMacros, type: :controller
 
   # Allow just create(:factory) instead of needing to specify FactoryBot.create(:factory)
diff --git a/spec/requests/conversations_spec.rb b/spec/requests/conversations_spec.rb
new file mode 100644
index 000000000..1ed996685
--- /dev/null
+++ b/spec/requests/conversations_spec.rb
@@ -0,0 +1,62 @@
+require 'rails_helper'
+
+describe 'Converstions' do
+  describe 'DELETE destroy_multiple' do
+    let!(:member) { create(:admin_member) }
+
+    before do
+      sign_in member
+    end
+
+    it 'redirects to the conversations inbox' do
+      delete '/conversations/destroy_multiple', params: { conversation_ids: [] }
+      expect(response).to redirect_to '/conversations'
+      follow_redirect!
+      expect(response).to render_template(:index)
+      expect(response).to have_http_status(200)
+    end
+
+    it 'allows users to trash multiple inbox conversations' do
+      first_conversation = create(:notification, recipient: member)
+      second_conversation = create(:notification, recipient: member)
+      conversations_to_trash = [first_conversation.id, second_conversation.id]
+
+      # we dont actually destroy the messages, we move them to the trash folder
+      expect do
+        delete '/conversations/destroy_multiple', params: { conversation_ids: conversations_to_trash, box: 'inbox' }
+      end.to_not change(Mailboxer::Conversation, :count)
+
+      expect(member.mailbox.inbox.count).to eq 0
+      expect(member.mailbox.trash.count).to eq 2
+    end
+
+    it 'only deletes conversations for the current user' do
+      second_member = create(:admin_member)
+      first_conversation = create(:notification, sender: member, recipient: second_member)
+      second_conversation = create(:notification, sender: member, recipient: second_member)
+      conversations_to_trash = [first_conversation.id, second_conversation.id]
+
+      # we dont actually destroy the messages, we move them to the trash folder
+      expect do
+        delete '/conversations/destroy_multiple', params: { conversation_ids: conversations_to_trash }
+      end.to_not change(Mailboxer::Conversation, :count)
+
+      expect(second_member.mailbox.inbox.count).to eq 2
+      expect(second_member.mailbox.trash.count).to eq 0
+    end
+
+    it 'allows users to trash multiple sent conversations' do
+      first_conversation = create(:notification, sender: member)
+      second_conversation = create(:notification, sender: member)
+      conversations_to_trash = [first_conversation.id, second_conversation.id]
+
+      # we dont actually destroy the messages, we move them to the trash folder
+      expect do
+        delete '/conversations/destroy_multiple', params: { conversation_ids: conversations_to_trash, box: 'sent' }
+      end.to_not change(Mailboxer::Conversation, :count)
+
+      expect(member.mailbox.sentbox.count).to eq 0
+      expect(member.mailbox.trash.count).to eq 2
+    end
+  end
+end

From 1e1b9f5ef5e5c764c03e312b2cf30bba56aff043 Mon Sep 17 00:00:00 2001
From: bestest-mensch <16200338+bestest-mensch@users.noreply.github.com>
Date: Sun, 6 Oct 2019 16:13:07 -0500
Subject: [PATCH 058/142] scope conversations delete multiple to current user

---
 app/controllers/conversations_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index 52b92a59a..a8b806a9d 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -34,7 +34,12 @@ class ConversationsController < ApplicationController
   end
 
   def destroy_multiple
-    Mailboxer::Conversation.where(id: params[:conversation_ids]).each do |conversation|
+    conversations = if @box.eql? 'sent'
+                      mailbox.sentbox
+                    else
+                      mailbox.inbox
+                    end
+    conversations.where(id: params[:conversation_ids]).each do |conversation|
       conversation.move_to_trash(current_member)
     end
     redirect_to conversations_path(box: params[:box])

From d72ec5890a13df2e6aeaef5824f99cd175b88094 Mon Sep 17 00:00:00 2001
From: bestest-mensch <16200338+bestest-mensch@users.noreply.github.com>
Date: Sun, 6 Oct 2019 16:53:34 -0500
Subject: [PATCH 059/142] address code climate issues

---
 spec/features/conversations/index_spec.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/spec/features/conversations/index_spec.rb b/spec/features/conversations/index_spec.rb
index 1746a314c..969fc447c 100644
--- a/spec/features/conversations/index_spec.rb
+++ b/spec/features/conversations/index_spec.rb
@@ -49,10 +49,7 @@ describe "Conversations", :js do
       click_link 'Your Stuff'
       click_link 'Inbox'
 
-      all('input[type=checkbox]').each do |checkbox|
-        checkbox.click
-      end
-
+      all('input[type=checkbox]').each(&:click)
       click_button 'Delete Selected'
 
       expect(page).not_to have_content 'this is a message'
@@ -70,10 +67,7 @@ describe "Conversations", :js do
       expect(page).to have_selector('.sent')
       find('.sent').click
 
-      all('input[type=checkbox]').each do |checkbox|
-        checkbox.click
-      end
-
+      all('input[type=checkbox]').each(&:click)
       click_button 'Delete Selected'
 
       expect(page).to have_selector('.sent')

From b0c8b11246f6424550c31c0bfe29d13837bc60dd Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 8 Oct 2019 11:06:53 +1300
Subject: [PATCH 060/142] =?UTF-8?q?=F0=9F=93=9D=20Inline=20editing=20and?=
 =?UTF-8?q?=20display=20tidy=20ups=20(#2200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Inline editing and display tidy ups
---
 app/assets/images/icons/COPYRIGHT             |   1 +
 app/assets/images/icons/add-photo.svg         |   1 +
 app/assets/images/icons/ant.svg               |   1 +
 app/assets/images/icons/bee.svg               |   1 +
 app/assets/images/icons/bug.svg               |   1 +
 app/assets/images/icons/butterfly.svg         |   1 +
 app/assets/images/icons/cat.svg               |   1 +
 app/assets/images/icons/delete.svg            |  12 +-
 app/assets/images/icons/earth-worm.svg        |   1 +
 app/assets/images/icons/edit.svg              |   1 +
 app/assets/images/icons/finish.svg            |   1 +
 app/assets/images/icons/garden.svg            |  26 -----
 app/assets/images/icons/gardener.svg          |   1 +
 app/assets/images/icons/gardens.svg           |   1 +
 app/assets/images/icons/grass.svg             |   1 +
 app/assets/images/icons/harvest-add.svg       |  10 ++
 app/assets/images/icons/harvest.svg           |   6 +-
 app/assets/images/icons/home.svg              |   5 -
 app/assets/images/icons/hose.svg              |   1 +
 app/assets/images/icons/insect.svg            |   1 +
 app/assets/images/icons/ladybird.svg          |   1 +
 app/assets/images/icons/notification.svg      |   1 +
 app/assets/images/icons/photo.svg             |   1 +
 app/assets/images/icons/plant-seeds.svg       |   3 -
 app/assets/images/icons/plant_parts/bark.svg  |   1 +
 app/assets/images/icons/plant_parts/bulb.svg  |   1 +
 .../images/icons/plant_parts/flower.svg       |   1 +
 app/assets/images/icons/plant_parts/fruit.svg |   1 +
 .../images/icons/plant_parts/leaves.svg       |   1 +
 app/assets/images/icons/plant_parts/pod.svg   |   1 +
 app/assets/images/icons/plant_parts/seeds.svg |   1 +
 app/assets/images/icons/plant_parts/tuber.svg |   1 +
 app/assets/images/icons/planting-add.svg      |  13 +++
 app/assets/images/icons/planting-hand.svg     |   1 +
 app/assets/images/icons/planting-sun.svg      |   1 +
 app/assets/images/icons/planting.svg          |   6 +-
 app/assets/images/icons/post.svg              |   7 +-
 app/assets/images/icons/rabbit.svg            |   1 +
 app/assets/images/icons/seed-add.svg          |  15 +++
 app/assets/images/icons/seeds-colour.svg      |  18 ---
 app/assets/images/icons/seeds.svg             |  17 ++-
 app/assets/images/icons/slug-eating.svg       |   1 +
 app/assets/images/icons/slug.svg              |   1 +
 app/assets/images/icons/snail.svg             |   1 +
 app/assets/images/icons/spiderweb.svg         |   1 +
 app/assets/images/icons/sprinkler.svg         |   1 +
 app/assets/images/icons/sprout-add.svg        |  11 ++
 app/assets/images/icons/sprout.svg            |   1 +
 app/assets/images/icons/stones.svg            |   1 +
 app/assets/images/icons/timeline.svg          |  23 ++++
 app/assets/images/icons/watering-can.svg      |   1 +
 app/assets/images/icons/wheelbarrow.svg       |   1 +
 app/assets/javascripts/datepicker.js          |   3 +
 app/assets/javascripts/editable.js            |   6 +
 app/assets/javascripts/plantings.js.coffee    |   6 -
 app/assets/javascripts/seeds.js.coffee        |   6 -
 app/assets/stylesheets/_crops.scss            |  38 +++----
 app/assets/stylesheets/_harvests.scss         |  34 ++++++
 app/assets/stylesheets/_members.scss          |  15 ---
 app/assets/stylesheets/_seeds.scss            |  10 ++
 app/assets/stylesheets/_variables.scss        |   3 +-
 app/assets/stylesheets/overrides.scss         |  68 ++++++++---
 app/controllers/crops_controller.rb           |   7 +-
 app/controllers/gardens_controller.rb         |  16 +--
 app/controllers/harvests_controller.rb        |   6 +-
 app/controllers/plantings_controller.rb       |   1 +
 app/controllers/seeds_controller.rb           |  23 ++--
 app/helpers/application_helper.rb             |  14 +--
 app/helpers/buttons_helper.rb                 |   2 +-
 app/helpers/editable_form_helper.rb           |   6 +
 app/helpers/gardens_helper.rb                 |   4 -
 app/helpers/icons_helper.rb                   |  35 ++++--
 app/helpers/plantings_helper.rb               |   8 +-
 app/models/concerns/predict_planting.rb       |   4 +
 app/models/crop.rb                            |   7 +-
 app/models/harvest.rb                         |  12 +-
 app/models/photo.rb                           |   4 +-
 app/models/planting.rb                        |   2 +
 app/models/seed.rb                            |   2 +-
 app/views/crops/_actions.html.haml            |  38 ++++---
 app/views/crops/_form.html.haml               |   2 +
 app/views/crops/_hierarchy.html.haml          |   2 +
 app/views/crops/_info.haml                    |   7 +-
 app/views/crops/_posts.html.haml              |   4 +-
 app/views/crops/_predictions.html.haml        |  15 ++-
 app/views/crops/_tiny.html.haml               |   8 +-
 app/views/crops/index.html.haml               |  28 ++---
 app/views/crops/show.html.haml                |  40 ++++---
 app/views/gardens/index.html.haml             |  38 +++++--
 app/views/gardens/show.html.haml              |  22 ++--
 app/views/harvests/_card.html.haml            |   2 +-
 app/views/harvests/_thumbnail.html.haml       |  19 ++--
 app/views/harvests/index.html.haml            |   1 -
 app/views/harvests/show.html.haml             |  86 ++++++++------
 app/views/home/_blurb.html.haml               |   2 +-
 app/views/home/_crops.html.haml               |   2 +-
 app/views/home/index.html.haml                |  16 ++-
 app/views/layouts/_header.html.haml           |  64 ++++++++---
 app/views/layouts/_nav.haml                   |  28 +++--
 app/views/layouts/_pagination.html.haml       |   1 -
 app/views/layouts/application.html.haml       |  17 ++-
 app/views/layouts/modal.html.haml             |  11 ++
 app/views/members/_tiny.haml                  |   2 +-
 app/views/photos/_tiny.html.haml              |   3 +
 app/views/photos/show.html.haml               |  29 +++--
 app/views/plant_parts/index.html.haml         |  38 ++++---
 app/views/plantings/_badges.html.haml         |  10 +-
 app/views/plantings/_card.html.haml           |  14 +--
 app/views/plantings/_descendants.html.haml    |  12 +-
 app/views/plantings/_facts.haml               | 107 +++++++++++-------
 app/views/plantings/_harvests.html.haml       |  15 ++-
 app/views/plantings/_photos.haml              |   4 +-
 app/views/plantings/_progress.html.haml       |   9 +-
 app/views/plantings/_progress_list.haml       |  15 +++
 app/views/plantings/_quick_actions.haml       |  22 ++--
 app/views/plantings/_tiny.html.haml           |   4 +
 app/views/plantings/index.html.haml           |  32 +++---
 app/views/plantings/show.html.haml            |  16 ++-
 app/views/posts/_single.html.haml             |  29 -----
 app/views/posts/show.html.haml                |   4 +-
 app/views/scientific_names/_form.html.haml    |   2 +-
 app/views/seeds/_card.html.haml               |   6 +-
 app/views/seeds/_facts.html.haml              |  34 ++++--
 app/views/seeds/_seed.haml                    |   2 +-
 app/views/seeds/index.html.haml               |  44 +++----
 app/views/seeds/show.html.haml                | 107 +++++++++---------
 app/views/shared/_global_actions.html.haml    |  25 ----
 app/views/shared/_signin_signup.html.haml     |  13 +--
 app/views/shared/editable/_date.html.haml     |  11 ++
 app/views/shared/editable/_form.html.haml     |  18 +++
 config/locales/en.yml                         |   3 +
 .../charts/gardens_controller_spec.rb         |   4 +-
 spec/features/crops/crop_detail_page_spec.rb  |  12 +-
 spec/features/gardens/index_spec.rb           |  10 +-
 .../harvests/harvesting_a_crop_spec.rb        |  16 +--
 .../plantings/planting_a_crop_spec.rb         |  18 +--
 spec/features/plantings/show_spec.rb          |   8 +-
 spec/features/seeds/adding_seeds_spec.rb      |   7 +-
 spec/features/seeds/misc_seeds_spec.rb        |   3 +-
 spec/features/shared_examples/append_date.rb  |   3 +-
 spec/views/photos/index.html.haml_spec.rb     |   2 +-
 141 files changed, 1001 insertions(+), 717 deletions(-)
 create mode 100644 app/assets/images/icons/COPYRIGHT
 create mode 100644 app/assets/images/icons/add-photo.svg
 create mode 100644 app/assets/images/icons/ant.svg
 create mode 100644 app/assets/images/icons/bee.svg
 create mode 100644 app/assets/images/icons/bug.svg
 create mode 100644 app/assets/images/icons/butterfly.svg
 create mode 100644 app/assets/images/icons/cat.svg
 create mode 100644 app/assets/images/icons/earth-worm.svg
 create mode 100644 app/assets/images/icons/edit.svg
 create mode 100644 app/assets/images/icons/finish.svg
 delete mode 100644 app/assets/images/icons/garden.svg
 create mode 100644 app/assets/images/icons/gardener.svg
 create mode 100644 app/assets/images/icons/gardens.svg
 create mode 100644 app/assets/images/icons/grass.svg
 create mode 100644 app/assets/images/icons/harvest-add.svg
 delete mode 100644 app/assets/images/icons/home.svg
 create mode 100644 app/assets/images/icons/hose.svg
 create mode 100644 app/assets/images/icons/insect.svg
 create mode 100644 app/assets/images/icons/ladybird.svg
 create mode 100644 app/assets/images/icons/notification.svg
 create mode 100644 app/assets/images/icons/photo.svg
 delete mode 100644 app/assets/images/icons/plant-seeds.svg
 create mode 100644 app/assets/images/icons/plant_parts/bark.svg
 create mode 100644 app/assets/images/icons/plant_parts/bulb.svg
 create mode 100644 app/assets/images/icons/plant_parts/flower.svg
 create mode 100644 app/assets/images/icons/plant_parts/fruit.svg
 create mode 100644 app/assets/images/icons/plant_parts/leaves.svg
 create mode 100644 app/assets/images/icons/plant_parts/pod.svg
 create mode 100644 app/assets/images/icons/plant_parts/seeds.svg
 create mode 100644 app/assets/images/icons/plant_parts/tuber.svg
 create mode 100644 app/assets/images/icons/planting-add.svg
 create mode 100644 app/assets/images/icons/planting-hand.svg
 create mode 100644 app/assets/images/icons/planting-sun.svg
 create mode 100644 app/assets/images/icons/rabbit.svg
 create mode 100644 app/assets/images/icons/seed-add.svg
 delete mode 100644 app/assets/images/icons/seeds-colour.svg
 create mode 100644 app/assets/images/icons/slug-eating.svg
 create mode 100644 app/assets/images/icons/slug.svg
 create mode 100644 app/assets/images/icons/snail.svg
 create mode 100644 app/assets/images/icons/spiderweb.svg
 create mode 100644 app/assets/images/icons/sprinkler.svg
 create mode 100644 app/assets/images/icons/sprout-add.svg
 create mode 100644 app/assets/images/icons/sprout.svg
 create mode 100644 app/assets/images/icons/stones.svg
 create mode 100644 app/assets/images/icons/timeline.svg
 create mode 100644 app/assets/images/icons/watering-can.svg
 create mode 100644 app/assets/images/icons/wheelbarrow.svg
 create mode 100644 app/assets/javascripts/datepicker.js
 create mode 100644 app/assets/javascripts/editable.js
 delete mode 100644 app/assets/javascripts/plantings.js.coffee
 delete mode 100644 app/assets/javascripts/seeds.js.coffee
 create mode 100644 app/helpers/editable_form_helper.rb
 delete mode 100644 app/views/layouts/_pagination.html.haml
 create mode 100644 app/views/layouts/modal.html.haml
 create mode 100644 app/views/photos/_tiny.html.haml
 create mode 100644 app/views/plantings/_progress_list.haml
 create mode 100644 app/views/plantings/_tiny.html.haml
 delete mode 100644 app/views/shared/_global_actions.html.haml
 create mode 100644 app/views/shared/editable/_date.html.haml
 create mode 100644 app/views/shared/editable/_form.html.haml

diff --git a/app/assets/images/icons/COPYRIGHT b/app/assets/images/icons/COPYRIGHT
new file mode 100644
index 000000000..acf08b86d
--- /dev/null
+++ b/app/assets/images/icons/COPYRIGHT
@@ -0,0 +1 @@
+Icons in this folder attributable to Icons8.com. Used with permission.
diff --git a/app/assets/images/icons/add-photo.svg b/app/assets/images/icons/add-photo.svg
new file mode 100644
index 000000000..a3a042c10
--- /dev/null
+++ b/app/assets/images/icons/add-photo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#512DA8" d="M31.9,10H12.2l3.4-5.1c0.4-0.6,1-0.9,1.7-0.9h9.6c0.7,0,1.3,0.3,1.7,0.9L31.9,10z"/><path fill="#8668C5" d="M12,9H6V7.2C6,6.5,6.5,6,7.2,6h3.6C11.5,6,12,6.5,12,7.2V9z"/><path fill="#5E35B1" d="M38,40H6c-2.2,0-4-1.8-4-4V12c0-2.2,1.8-4,4-4h32c2.2,0,4,1.8,4,4v24C42,38.2,40.2,40,38,40"/><path fill="#512DA8" d="M10,24c0-6.6,5.4-12,12-12s12,5.4,12,12c0,6.6-5.4,12-12,12S10,30.6,10,24z"/><path fill="#B388FF" d="M22 15A9 9 0 1 0 22 33A9 9 0 1 0 22 15Z"/><path fill="#C7A7FF" d="M26.9,20.8c-1.2-1.4-3-2.2-4.8-2.2s-3.6,0.8-4.8,2.2c-0.5,0.5-0.4,1.3,0.1,1.8c0.5,0.5,1.3,0.4,1.8-0.1c1.5-1.7,4.3-1.7,5.8,0c0.3,0.3,0.6,0.4,1,0.4c0.3,0,0.6-0.1,0.9-0.3C27.4,22.2,27.4,21.4,26.9,20.8z"/><path fill="#8668C5" d="M9 9.9A2 1.5 0 1 0 9 12.9A2 1.5 0 1 0 9 9.9Z"/><path fill="#4CAF50" d="M36 26A10 10 0 1 0 36 46A10 10 0 1 0 36 26Z"/><path fill="#FFF" d="M42 34L38 34 38 30 34 30 34 34 30 34 30 38 34 38 34 42 38 42 38 38 42 38z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/ant.svg b/app/assets/images/icons/ant.svg
new file mode 100644
index 000000000..da94eac67
--- /dev/null
+++ b/app/assets/images/icons/ant.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M19,36c0,3.9,3,7,5,7s5-3.1,5-7s-1-7-5-7S19,32.1,19,36z"/><path fill="#795548" d="M21 21c0 1.7 1 10 3 10s3-8.3 3-10-1.3-3-3-3S21 19.3 21 21zM29 13c0 5-3 3-5 3s-5 2-5-3c0-2.8 2-7 5-7S29 10.2 29 13z"/><path fill="#5d4037" d="M14.3 18.8l6.7 3c0-.3 0-.6 0-.8 0-.5.1-.9.3-1.3l-5.6-2.5-4.8-6.8c-.3-.4-.9-.6-1.4-.2-.5.3-.6.9-.2 1.4L14.3 18.8zM27 21c0 .2 0 .5 0 .8l6.7-3 5.2-7.2c.3-.4.2-1.1-.2-1.4-.4-.3-1.1-.2-1.4.2l-4.8 6.8-5.6 2.5C26.9 20.1 27 20.5 27 21zM21.6 26c-.1-.7-.2-1.4-.3-2h-6.1l-5.8-2.9c-.5-.2-1.1 0-1.3.4-.2.5 0 1.1.4 1.3l6.2 3.1H21.6zM39.9 21.6c-.2-.5-.8-.7-1.3-.4L32.8 24h-6.1c-.1.6-.2 1.3-.3 2h6.9l6.2-3.1C39.9 22.6 40.1 22 39.9 21.6zM22.5 29.2c-.2-.5-.4-1-.5-1.6l-8.7 2.6-4.2 8.4c-.2.5 0 1.1.4 1.3C9.7 40 9.8 40 10 40c.4 0 .7-.2.9-.6l3.8-7.6 6.3-1.9C21.4 29.6 21.9 29.3 22.5 29.2zM34.7 30.2L26 27.6c-.2.6-.3 1.1-.5 1.6.6.2 1.1.4 1.5.8l6.3 1.9 3.8 7.6c.2.4.5.6.9.6.2 0 .3 0 .4-.1.5-.2.7-.8.4-1.3L34.7 30.2zM32.4 10H26c-.6 0-1-.4-1-1s.4-1 1-1h5.6l3.7-3.7c.4-.4 1-.4 1.4 0s.4 1 0 1.4L32.4 10zM22 10h-6.4l-4.3-4.3c-.4-.4-.4-1 0-1.4s1-.4 1.4 0L16.4 8H22c.6 0 1 .4 1 1S22.6 10 22 10z"/><path fill="#4e342e" d="M20.7 30.2c1 .5 2.1.8 3.3.8s2.3-.3 3.3-.8C26.6 29.4 25.5 29 24 29S21.4 29.4 20.7 30.2zM24 35c1.7 0 3.4-.4 4.9-1.2-.1-.7-.3-1.4-.5-2l-.1.1C27 32.6 25.5 33 24 33c-1.5 0-3-.4-4.3-1.1l-.1-.1c-.2.6-.4 1.3-.5 2C20.6 34.6 22.3 35 24 35zM24 37c-1.7 0-3.4-.4-5-1 0 0 0 0 0 0 0 .8.1 1.5.3 2.2 1.5.5 3.1.8 4.7.8s3.1-.3 4.7-.8c.2-.7.3-1.4.3-2.2 0 0 0 0 0 0C27.4 36.6 25.7 37 24 37zM28.2 39.5c-.2.4-.4.8-.7 1.1C26.3 40.9 25.2 41 24 41s-2.3-.1-3.5-.4c1 1.5 2.4 2.4 3.5 2.4C25.3 43 27.1 41.6 28.2 39.5zM24 18c-1.4 0-2.7 1-2.9 2.4 0 0 0 0 0 0 .7 0 1.3-.1 1.9-.2.4-.1.8-.2 1-.2s.6.1 1 .2c.6.1 1.2.2 1.9.2 0 0 0 0 0 0C26.7 19 25.4 18 24 18z"/><path fill="#4e342e" d="M24 16c-.3 0-.7.1-1 .1V19h2v-2.9C24.7 16.1 24.3 16 24 16zM26.1 5.9c0 .3.1.6.1.9C26.6 7.1 27 7.5 27.3 8L28 8c-.1-.5-.2-.9-.4-1.3-.2-.4-.4-.8-.6-1.2-.5-.7-1.2-1.3-2-1.5C25.6 4.5 25.9 5.2 26.1 5.9zM21.9 6.8c0-.3 0-.6.1-.9C22.1 5.2 22.4 4.5 23 4c-.8.2-1.5.8-2 1.5-.2.4-.5.8-.6 1.2C20.2 7.1 20.1 7.5 20 8l.7 0C21 7.5 21.4 7.1 21.9 6.8z"/><path d="M22 12c0 .6-.4 1-1 1s-1-.4-1-1 .4-1 1-1S22 11.4 22 12zM28 12c0 .6-.4 1-1 1s-1-.4-1-1 .4-1 1-1S28 11.4 28 12z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/bee.svg b/app/assets/images/icons/bee.svg
new file mode 100644
index 000000000..fa3cdfc99
--- /dev/null
+++ b/app/assets/images/icons/bee.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#42a5f5" d="M29.4,21L29.4,21c0,0-6.7-13.7-9.7-14.9c-1.9-0.7-3.5,6.2-0.8,10.4c2.2,3.6,9.1,5.8,9.1,5.8l0,0 c0.1,0,0.1,0.1,0.2,0.1c0.5,0.2,1.1-0.1,1.3-0.6C29.6,21.6,29.6,21.3,29.4,21z"/><path fill="#5d4037" d="M29.5 31.9C29.5 31.9 29.5 31.9 29.5 31.9c.1-.2.2-.4.2-.6 0 0 0 0 0 0 .2-.6.3-1.2.3-1.8 0-2.7-1.7-5-4-6-3.6-2.2-6.4-.2-8 2.5-.2.3-.4.6-.5 1C13.6 35.4 19.2 41.1 20 42c1.4-5.1 6.9-4.3 9.3-9.8C29.4 32.1 29.5 32 29.5 31.9L29.5 31.9zM35 14c-.2 0-.3 0-.4-.1-.5-.2-.7-.8-.4-1.3l1.2-2.4L40.8 9c.5-.1 1.1.2 1.2.8.1.5-.2 1.1-.8 1.2l-4.5.9-.8 1.6C35.7 13.8 35.4 14 35 14z"/><path fill="#5d4037" d="M33,13c-0.4,0-0.8-0.3-0.9-0.7l-1.3-3.9l6.9-2.3c0.5-0.2,1.1,0.1,1.3,0.6c0.2,0.5-0.1,1.1-0.6,1.3 l-5.1,1.7l0.7,2.1c0.2,0.5-0.1,1.1-0.6,1.3C33.2,13,33.1,13,33,13z"/><path fill="#ffc107" d="M26.8 35.6c.2-.2.4-.3.6-.5-2.1.5-4.3.5-6.3.2-1.1-.2-2.2-.5-3.3-.8-.5-.2-1.1-.4-1.6-.6.1 1.3.4 2.5.8 3.6.1 0 .1 0 .2 0 1.3.1 2.6 0 3.8-.1C23 37 25 36.4 26.8 35.6zM18.7 24.9c.4.5.9 1 1.4 1.5 1.1 1.1 2.3 2 3.6 2.7 1.3.8 2.7 1.3 4.1 1.6.7.1 1.4.2 2 .3 0-.2.1-.3.1-.5-1.9-.6-3.7-1.6-5.1-3-.9-.9-1.7-1.9-2.4-3-.3-.5-.6-1.1-.9-1.7 0 0 0 0 0-.1C20.4 23.1 19.5 23.9 18.7 24.9zM22.8 31.3c-1.2-.6-2.4-1.4-3.5-2.2-.7-.5-1.4-1.1-2-1.7-.5 1.2-.9 2.4-1 3.5.5.3 1 .5 1.5.7 1.4.6 2.9 1.1 4.3 1.5 2.1.5 4.4.7 6.5.4.1-.2.2-.3.3-.5C26.8 32.9 24.7 32.2 22.8 31.3z"/><path fill="#795548" d="M32.8,25.8c-2.1,2.1-4.7,1.3-6.8-0.8c-2.1-2.1-2.8-4.7-0.8-6.8c2.1-2.1,4.7-1.3,6.8,0.8 C34.1,21.1,34.8,23.7,32.8,25.8z"/><path fill="#8d6e63" d="M37.8,18.9c-0.9,2-4.8,1.1-7.4-0.1c-2-0.9-2.9-3.3-2-5.4c0.9-2.1,3.1-2.6,5.2-2.1 C36.1,12,38.7,16.8,37.8,18.9z"/><path fill="#4e342e" d="M32.6,19.6c-0.8-0.2-1.5-0.5-2.2-0.8c-0.8-0.4-1.4-1-1.8-1.7c-0.7-0.1-2.2,0-2.9,0.9 c0.6,1.4,0.8,3.5,2.3,4.1c2.9,1.1,4.8,0.7,5.9,0C33.6,21.2,33.2,20.4,32.6,19.6z"/><path fill="#3e2723" d="M35.4,17.3c-0.5,0.7-2,0.5-3.5-0.6s-2.3-2.6-1.8-3.3c0.5-0.7,2-0.5,3.5,0.6 C35.1,15.1,35.9,16.6,35.4,17.3z"/><path fill="#90caf9" d="M28.6,20.2L28.6,20.2C28.6,20.2,12.2,6,9,6c-2,0-1,7,3,10c3.4,2.5,15.8,6,15.8,6l0,0 c0.1,0,0.2,0.1,0.2,0.1c0.6,0,1-0.4,1-1C29,20.7,28.8,20.4,28.6,20.2z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/bug.svg b/app/assets/images/icons/bug.svg
new file mode 100644
index 000000000..bc5b5da5f
--- /dev/null
+++ b/app/assets/images/icons/bug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#455a64" d="M34.4 44.8l-3-2c-.2-.2-.4-.4-.4-.7l-.9-6.6-3.7-2.8 1.2-1.6 4 3c.2.2.4.4.4.7l.9 6.6 2.6 1.8L34.4 44.8zM35.3 33.7l-2-2c-.1-.1-.2-.3-.3-.5l-.8-3.4L27.8 27l.4-2 5 1c.4.1.7.4.8.7l.9 3.7 1.8 1.8L35.3 33.7zM29.4 22.9l-.7-1.9 3.9-1.6-2.4-4c-.2-.3-.2-.7 0-1.1l2-3 1.7 1.1L32.2 15l2.7 4.5c.2.3.2.6.1.8-.1.3-.3.5-.6.6L29.4 22.9zM13.6 44.8l-1.1-1.7 2.6-1.8.9-6.6c0-.3.2-.5.4-.7l4-3 1.2 1.6-3.7 2.8L17 42.1c0 .3-.2.5-.4.7L13.6 44.8zM12.7 33.7l-1.4-1.4 1.8-1.8.9-3.7c.1-.4.4-.7.8-.7l5-1 .4 2-4.4.9L15 31.2c0 .2-.1.3-.3.5L12.7 33.7zM18.6 22.9l-5-2c-.3-.1-.5-.3-.6-.6C13 20 13 19.7 13.1 19.5l2.7-4.5-1.6-2.5 1.7-1.1 2 3c.2.3.2.7 0 1.1l-2.4 4 3.9 1.6L18.6 22.9z"/><path fill="#4db6ac" d="M26 14h-2C24 4.2 38.3 3 38.9 3l.1 2C38.9 5 26 6 26 14zM24 14h-2C22 6 9.1 5 8.9 5l.1-2C9.7 3 24 4.2 24 14z"/><path fill="#00695c" d="M27,20.8c0,1.7-1.4,3-3,3s-3-1.4-3-3V15c0-1.7,1.4-3,3-3s3,1.4,3,3V20.8z"/><path fill="#26a69a" d="M24,42c-6,0-7-22-7-22c0-1.1,4-2,7-2s7,0.9,7,2C31,20,30,42,24,42z"/><path fill="#00897b" d="M23,41.8c0.3,0.1,0.6,0.2,1,0.2s0.7-0.1,1-0.2V18c-0.3,0-0.7,0-1,0s-0.7,0-1,0V41.8z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/butterfly.svg b/app/assets/images/icons/butterfly.svg
new file mode 100644
index 000000000..551cc7323
--- /dev/null
+++ b/app/assets/images/icons/butterfly.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#37474F" d="M25 29c0 .553-.447 1-1 1l0 0c-.553 0-1-.447-1-1V19c0-.553.447-1 1-1l0 0c.553 0 1 .447 1 1V29zM24 16A1 1 0 1 0 24 18 1 1 0 1 0 24 16z"/><path fill="#2962FF" d="M25 20h6c0 0 6 0 6 5s-3 7-3 7-2.705 3.25-3.251 2.336C28.628 30.782 25 22.795 25 22V20zM23.082 20h-6c0 0-6 0-6 5s3 7 3 7 2.705 3.25 3.251 2.336c2.121-3.554 5.749-11.541 5.749-12.336V20z"/><path fill="#448AFF" d="M36.792 6.918C37 6.625 38.609 6 39 6c-8 0-14 11-14 13 0 .5 0 .813 0 1 0 0 7.802 0 11 0 0-.637 0-1.363 0-2C36 18 37.5 14.418 36.792 6.918zM11.29 6.918C11.082 6.625 9.473 6 9.082 6c8 0 14 11 14 13 0 .5 0 .813 0 1 0 0-7.802 0-11 0 0-.637 0-1.363 0-2C12.082 18 10.582 14.418 11.29 6.918z"/><g><path fill="#263238" d="M39 6c-.391 0-2 .625-2.208.918C37.5 14.418 36 18 36 18c0 .637 0 1.363 0 2 .422 0 .767 0 1 0 3 0 3-2 3-2s.418-4.707 1.417-6.707C42.583 8.959 43 8 43 8S44 6 39 6zM9.082 6c.391 0 2 .625 2.208.918C10.582 14.418 12.082 18 12.082 18c0 .637 0 1.363 0 2-.422 0-.767 0-1 0-3 0-3-2-3-2s-.418-4.707-1.417-6.707C5.499 8.959 5.082 8 5.082 8S4.082 6 9.082 6z"/></g><g><path fill="#455A64" d="M33.25,19.043c0.607-0.296,1.144-0.428,1.672-0.529c0.525-0.092,1.031-0.127,1.533-0.121c0.501,0.006,0.997,0.057,1.51,0.15c0.517,0.105,1.037,0.229,1.661,0.5c-0.413,0.541-0.95,0.85-1.5,1.064c-0.553,0.205-1.13,0.294-1.699,0.284c-0.57-0.009-1.135-0.114-1.675-0.32C34.216,19.852,33.689,19.563,33.25,19.043z"/><path fill="#455A64" d="M33.542,17c0.48-0.643,0.979-0.982,1.481-1.232c0.503-0.236,1.012-0.354,1.523-0.368c0.513-0.015,1.029,0.079,1.546,0.294c0.516,0.226,1.036,0.549,1.533,1.182c-0.517,0.615-1.011,0.939-1.51,1.176c-0.497,0.226-0.995,0.338-1.497,0.348s-1.007-0.078-1.518-0.281C34.59,17.902,34.074,17.599,33.542,17z"/><path fill="#455A64" d="M33.667,15c0.309-0.787,0.742-1.293,1.21-1.709c0.474-0.404,0.995-0.693,1.554-0.879c0.558-0.187,1.156-0.266,1.788-0.217c0.631,0.061,1.303,0.223,1.99,0.723c-0.437,0.724-0.874,1.171-1.345,1.545c-0.47,0.363-0.966,0.625-1.495,0.797c-0.529,0.173-1.091,0.26-1.695,0.243C35.065,15.476,34.425,15.369,33.667,15z"/><path fill="#455A64" d="M34,12c0.355-0.805,0.829-1.328,1.335-1.766c0.511-0.426,1.066-0.739,1.659-0.953c0.593-0.215,1.224-0.328,1.892-0.322c0.672,0.017,1.377,0.127,2.156,0.541c-0.411,0.779-0.891,1.276-1.399,1.693c-0.511,0.404-1.056,0.705-1.636,0.91c-0.58,0.207-1.193,0.322-1.85,0.332C35.497,12.436,34.805,12.353,34,12z"/><path fill="#455A64" d="M33 10c.233-1.002.813-1.75 1.468-2.363.668-.604 1.454-1.053 2.298-1.336.843-.285 1.748-.395 2.646-.312C40.309 6.089 41.205 6.358 42 7c-.818.609-1.535.984-2.233 1.32C39.07 8.653 38.4 8.918 37.715 9.146c-.687.227-1.388.414-2.145.566C34.805 9.861 34.008 9.971 33 10zM14.832 19.043c-.439.521-.966.809-1.502 1.028-.54.206-1.104.312-1.675.32-.569.01-1.146-.079-1.699-.284-.55-.215-1.087-.523-1.5-1.064.624-.271 1.145-.395 1.661-.5.513-.094 1.009-.145 1.51-.15.502-.006 1.008.029 1.533.121C13.688 18.615 14.225 18.747 14.832 19.043z"/><path fill="#455A64" d="M14.54,17c-0.532,0.599-1.048,0.902-1.56,1.117c-0.511,0.203-1.016,0.291-1.518,0.281s-1-0.122-1.497-0.348c-0.499-0.236-0.993-0.561-1.51-1.176c0.497-0.633,1.018-0.956,1.533-1.182c0.517-0.215,1.033-0.309,1.546-0.294c0.512,0.015,1.021,0.132,1.523,0.368C13.561,16.018,14.06,16.357,14.54,17z"/><path fill="#455A64" d="M14.415,15c-0.758,0.369-1.398,0.476-2.007,0.503c-0.604,0.017-1.166-0.07-1.695-0.243c-0.529-0.172-1.025-0.434-1.495-0.797c-0.471-0.374-0.908-0.821-1.345-1.545c0.688-0.5,1.359-0.662,1.99-0.723c0.632-0.049,1.23,0.03,1.788,0.217c0.559,0.186,1.08,0.475,1.554,0.879C13.673,13.707,14.106,14.213,14.415,15z"/><path fill="#455A64" d="M14.082,12c-0.805,0.353-1.497,0.436-2.157,0.436c-0.656-0.01-1.27-0.125-1.85-0.332c-0.58-0.205-1.125-0.506-1.636-0.91C7.931,10.776,7.451,10.279,7.04,9.5c0.779-0.414,1.484-0.524,2.156-0.541c0.668-0.006,1.299,0.107,1.892,0.322c0.593,0.214,1.148,0.527,1.659,0.953C13.253,10.672,13.727,11.195,14.082,12z"/><path fill="#455A64" d="M15.082,10c-1.008-0.029-1.805-0.139-2.57-0.287c-0.757-0.152-1.458-0.34-2.145-0.566C9.682,8.918,9.012,8.653,8.315,8.32C7.617,7.984,6.9,7.609,6.082,7c0.795-0.642,1.691-0.911,2.589-1.011c0.897-0.083,1.803,0.026,2.646,0.312c0.844,0.283,1.63,0.732,2.298,1.336C14.269,8.25,14.849,8.998,15.082,10z"/></g><g><path fill="#37474F" d="M14.082 32c0 0-3-2-3-7s6-5 6-5h-4c0 0-4 0-4 5s3 9 3 9 2 3 4 2c.258-.129.703-.751 1.246-1.659C16.772 35.231 14.082 32 14.082 32zM35 20h-4c0 0 6 0 6 5s-3 7-3 7-2.69 3.231-3.246 2.341C31.297 35.249 31.742 35.871 32 36c2 1 4-2 4-2s3-4 3-9S35 20 35 20zM41.561 38.439c.604.568.586 1.535 0 2.121s-1.54.591-2.121 0c-.643-.654-.783-3.107-.783-3.107S40.828 37.75 41.561 38.439z"/><path fill="#37474F" d="M39 39.641c-.578-2.031-3.75-4.531-5.109-3.703-.859.234 3.828-6.063 3.609-4.547-1.188 2.156 1.938 5.969 3.625 6.766C40.953 38.625 39.594 39.75 39 39.641zM35 26c.42-.562.862-.784 1.289-.889.427-.092.851-.03 1.232.179.379.206.726.576.895 1.085C38.579 26.873 38.543 27.542 38 28c-.689-.16-1.047-.061-1.317-.025-.262.042-.439.04-.614-.061-.172-.098-.338-.28-.513-.569C35.38 27.044 35.206 26.662 35 26z"/><path fill="#37474F" d="M34,28c0.646-0.323,1.14-0.384,1.583-0.365c0.437,0.029,0.811,0.163,1.125,0.385c0.314,0.223,0.569,0.538,0.744,0.954c0.162,0.423,0.282,0.94,0.11,1.651c-0.696,0.19-1.149,0.24-1.566,0.205c-0.407-0.04-0.746-0.163-1.032-0.37s-0.521-0.493-0.695-0.877C34.099,29.188,33.976,28.721,34,28z"/><path fill="#37474F" d="M33,30c0.728-0.069,1.219,0.043,1.638,0.209c0.409,0.174,0.726,0.419,0.961,0.726c0.236,0.306,0.389,0.675,0.448,1.116c0.051,0.447,0.028,0.95-0.234,1.637c-0.731,0.071-1.223-0.04-1.641-0.207c-0.409-0.174-0.726-0.419-0.958-0.728c-0.233-0.309-0.386-0.678-0.445-1.118C32.719,31.187,32.741,30.684,33,30z"/><path fill="#37474F" d="M31 31c.666.355 1.076.613 1.415.865.33.248.562.471.734.711.175.241.281.506.397.869L34 35c-.619.447-1.282.488-1.871.33-.588-.164-1.096-.544-1.428-1.021-.337-.477-.506-1.045-.487-1.618C30.248 32.118 30.433 31.519 31 31zM6.521 38.439c-.604.568-.586 1.535 0 2.121s1.54.591 2.121 0c.643-.654.783-3.107.783-3.107S7.254 37.75 6.521 38.439z"/><path fill="#37474F" d="M9.082 39.641c.578-2.031 3.75-4.531 5.109-3.703.859.234-3.828-6.063-3.609-4.547 1.188 2.156-1.938 5.969-3.625 6.766C7.129 38.625 8.488 39.75 9.082 39.641zM13.082 26c-.206.662-.38 1.044-.556 1.345-.175.289-.34.472-.513.569-.174.101-.353.103-.613.061-.271-.035-.628-.135-1.318.025-.543-.458-.579-1.127-.416-1.625.169-.509.516-.879.895-1.085.382-.209.805-.271 1.232-.179C12.22 25.216 12.662 25.438 13.082 26z"/><path fill="#37474F" d="M14.082,28c0.024,0.721-0.099,1.188-0.268,1.583c-0.176,0.384-0.41,0.67-0.696,0.877s-0.625,0.33-1.032,0.37c-0.417,0.035-0.87-0.015-1.566-0.205c-0.171-0.711-0.052-1.229,0.11-1.651c0.175-0.416,0.43-0.731,0.744-0.954c0.315-0.222,0.688-0.355,1.125-0.385C12.942,27.616,13.436,27.677,14.082,28z"/><path fill="#37474F" d="M15.082,30c0.259,0.684,0.281,1.187,0.231,1.635c-0.06,0.44-0.212,0.81-0.445,1.118c-0.232,0.309-0.548,0.554-0.958,0.728c-0.418,0.167-0.91,0.278-1.641,0.207c-0.262-0.687-0.285-1.189-0.235-1.637c0.06-0.441,0.212-0.811,0.449-1.116c0.236-0.307,0.552-0.552,0.961-0.726C13.864,30.043,14.354,29.931,15.082,30z"/><path fill="#37474F" d="M17.082 31c.567.519.752 1.118.786 1.69.02.573-.15 1.142-.487 1.618-.332.478-.839.857-1.427 1.021-.589.158-1.252.117-1.871-.33l.454-1.555c.115-.363.222-.628.396-.869.173-.24.405-.463.734-.711C16.006 31.613 16.417 31.355 17.082 31zM34.962 21.108c-.694-.454-1.455-.796-2.273-1.011C32.533 20.06 32.375 20.03 32.216 20H30c.44.904.965 1.554 1.522 2.139.562.574 1.159 1.058 1.794 1.477.635.419 1.308.769 2.039 1.06.742.285 1.517.522 2.52.637-.125-1.006-.558-1.807-1.069-2.499C36.282 22.129 35.655 21.561 34.962 21.108zM15.394 20.098c-.819.214-1.58.557-2.273 1.011-.694.453-1.321 1.021-1.844 1.706-.513.692-.945 1.493-1.07 2.499 1.003-.115 1.777-.352 2.519-.637.732-.291 1.405-.64 2.04-1.06.635-.418 1.232-.903 1.794-1.477.558-.585 1.083-1.235 1.522-2.139h-2.215C15.708 20.03 15.549 20.06 15.394 20.098z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/cat.svg b/app/assets/images/icons/cat.svg
new file mode 100644
index 000000000..14fe24a4f
--- /dev/null
+++ b/app/assets/images/icons/cat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#455A64" d="M33.906,27.118C33.474,23.776,31.156,12,20,12c0,0-3.554,0.003-6.196,3.727c-0.079-0.094-0.144-0.178-0.244-0.287C13.545,15.423,12,13.813,12,11.5C12,9.288,14.432,7,18.5,7c4.5,0,5.635,1.928,5.654,1.975c0.262,0.785,1.114,1.214,1.897,0.948c0.786-0.262,1.21-1.111,0.948-1.897C26.945,7.861,25,4,18.5,4C12.554,4,9,7.813,9,11.5c0,3.58,2.34,5.961,2.439,6.061c0.34,0.339,0.643,0.617,0.929,0.87c-0.746,1.905-1.261,4.381-1.35,7.583L11,26v16c0,0,0,0,2,0s2,0,2,0v-5c0,0,1-9,4-9s3,4,3,4v10c0,0,0,0,2,0s2,0,2,0V32c0,0,0-1.999,2-1.999S30,32,30,32v10c0,0,0,0,2,0s2,0,2,0V32v-4v-0.999L33.906,27.118z"/><path fill="#455A64" d="M32.22 15A6.5 6.5 0 1 0 32.22 28A6.5 6.5 0 1 0 32.22 15Z"/><path fill="#37474F" d="M38.307 19.236c.496-1.729 1.035-4.369.413-6.236l-3.591 2.693C36.589 16.426 37.731 17.691 38.307 19.236zM29.481 15.611L26 13c-.575 1.725-.158 4.108.301 5.825C26.941 17.409 28.073 16.267 29.481 15.611z"/><g><path fill="#FFEB3B" d="M36.72 19c0 0 .292 3-1.5 3-.827 0-1.499 0-1.499 0s-.334-3 1.499-3C36.048 19 36.72 19 36.72 19zM27.72 19.002c0 0-.374 2.998 1.5 2.998.828 0 1.5.002 1.5.002S31.096 19 29.22 19C28.392 19 27.72 19.002 27.72 19.002z"/></g><g><path fill="#263238" d="M26 42c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2H26zM15 42c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2H15zM34 42c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2H34zM32.22 28c-2.236 0-4.209-1.13-5.378-2.851-.16-.235-.301-.485-.43-.742-.026-.054-.053-.108-.078-.163-.241-.516-.416-1.069-.515-1.648-.012-.069-.022-.138-.032-.208-.039-.292-.067-.587-.067-.889 0-.953.215-1.853.583-2.668-.001-.002-.001-.005-.002-.007 0-.001.001-.001.001-.002-.209-.789-.409-1.719-.509-2.66-.002-.013-.004-.026-.005-.039-.098-.952-.091-1.914.114-2.754-.578-.302-1.199-.56-1.863-.77-.562 1.931-.262 4.268.169 6.105-.312.875-.488 1.813-.488 2.795 0 4.688 3.813 8.5 8.5 8.5.61 0 1.206-.068 1.78-.191v-2.062C33.434 27.908 32.838 28 32.22 28z"/><path fill="#263238" d="M32.72,24c0,0-0.542,0.75-1,0l-1-0.998v-1L33.721,22v1L32.72,24z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/delete.svg b/app/assets/images/icons/delete.svg
index 899b79b86..458ebd746 100644
--- a/app/assets/images/icons/delete.svg
+++ b/app/assets/images/icons/delete.svg
@@ -1,11 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="96px" height="96px">
-<g id="surface1">
-<path style=" fill:#9FA8DA;" d="M 12 13 L 12 38 C 12 40.210938 13.789063 42 16 42 L 32 42 C 34.210938 42 36 40.210938 36 38 L 36 13 Z "/>
-<path style=" fill:#7986CB;" d="M 23 15 L 25 15 L 25 38 L 23 38 Z "/>
-<path style=" fill:#7986CB;" d="M 29 15 L 31 15 L 31 38 L 29 38 Z "/>
-<path style=" fill:#7986CB;" d="M 17 15 L 19 15 L 19 38 L 17 38 Z "/>
-<path style=" fill:#5C6BC0;" d="M 10 11 L 38 11 L 38 15 L 10 15 Z "/>
-<path style=" fill:#5C6BC0;" d="M 21.800781 13.027344 C 21.308594 12.492188 21 11.785156 21 11 C 21 9.34375 22.34375 8 24 8 C 25.65625 8 27 9.34375 27 11 C 27 11.785156 26.691406 12.492188 26.199219 13.027344 L 28.5625 13.027344 C 28.839844 12.40625 29 11.722656 29 11 C 29 8.238281 26.761719 6 24 6 C 21.238281 6 19 8.238281 19 11 C 19 11.722656 19.160156 12.40625 19.4375 13.027344 Z "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#ff3d00" d="M34,11l-6-6h-8l-6,6h-3v28c0,2.2,1.8,4,4,4h18c2.2,0,4-1.8,4-4V11H34z"/><path fill="#ff6e40" d="M11,7h26c1.1,0,2,0.9,2,2v2H9V9C9,7.9,9.9,7,11,7z"/><path fill="#fafafa" d="M15.515 25H32.486000000000004V29H15.515z" transform="rotate(-45.001 24 27)"/><path fill="#fafafa" d="M22 18.515H26V35.486000000000004H22z" transform="rotate(-45.001 24 27)"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/earth-worm.svg b/app/assets/images/icons/earth-worm.svg
new file mode 100644
index 000000000..e5e9b1f13
--- /dev/null
+++ b/app/assets/images/icons/earth-worm.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#ef9a9a" d="M35.018 34.126c-2.546-.192-6.051 1.718-7.434 2.939-2.035-.094-4.119-.123-5.881.17-1.252-.665-3.652-1.256-5.101-1.347-.31-.441-.68-.838-1.041-1.227-.752-.807-1.401-1.504-1.401-2.388l-8.832-2.847C5.113 30.292 5 31.276 5 32.274 5 40.997 11.889 46 23.9 46c4.289 0 9.829-1.611 12.547-5.225.687-.953 2.086-3.07 1.053-5.153C37.166 35.002 36.465 34.239 35.018 34.126zM39.006 6.987c-1.39-2.409-4.498-4.6-9.373-4.002-4.736-2.198-8.342-.257-9.879 1.35-1.332.178-2.902 1.274-2.911 1.281-1.67 1.233-2.328 2.48-2.67 4.769-.169 1.031.114 2.004.775 2.669.761.768 1.979 1.008 3.311.674 1.281-.281 2.183-.706 3.177-1.243.911-.493 1.772-.959 2.779-1.18 3.076-.678 7.137-.188 8.914 2.007.41.578.605 1.227.482 1.558-.367.925-2.058 1.4-3.177 1.715l-.304.087c-2.162.519-4.22.928-6.129 1.294l-1.074.214c-3.256.644-6.946 1.375-10.097 2.869l.429.903 0 .001 3.779 5.711c0 0 .551 1.048.921 1.048 1.862 0 4.3-.47 6.254-1.61 1.763.149 6.246-.408 8.326-1.726 2.135.065 4.613-.855 6.431-2.422 1.312-1.13 2.14-2.499 2.375-3.906C42.949 17.832 43 14.899 43 14.537 43 10.033 40.722 7.642 39.006 6.987z"/><path fill="#e98888" d="M34.76 12.15l-.04-.05-.04-.05c-1.56-1.92-4.4-3.03-7.79-3.03-1.07 0-2.11.11-3.1.33-1.29.28-2.31.84-3.31 1.38-.94.51-1.64.82-2.65 1.04l-.03.01-.03.01c-.23.06-.45.09-.65.09s-1.87.057-2.95-1.5c-.17 1.04.12 2.01.78 2.67.53.55 1.3.82 2.17.82.36 0 .75-.04 1.14-.14 1.28-.28 2.18-.71 3.18-1.25.91-.49 1.77-.95 2.77-1.18.85-.18 1.76-.28 2.68-.28 2.45 0 4.95.7 6.24 2.29.41.58.6 1.23.48 1.56-.37.92-2.06 1.4-3.18 1.71l-.3.09c-2.16.52-4.22.93-6.13 1.3l-1.07.21c-3.26.64-6.95 1.37-10.1 2.87l.857 2.013 2.023-1.033c2.46-.87 5.16-1.4 7.61-1.89l1.06-.21c1.93-.37 4.02-.79 6.22-1.31l.04-.01.04-.02.3-.08c1.49-.42 3.76-1.06 4.51-2.94C36.03 14.11 35.07 12.59 34.76 12.15zM37.5 35.62c-.958 2.07-1.809 2.893-2.65 3.95C32.479 42.547 27.57 44 23.9 44 17.59 44 7 42.48 7 32.27l.083-.77L5.33 29.43C5.11 30.29 5 31.28 5 32.27 5 41 11.89 46 23.9 46c4.29 0 9.83-1.61 12.55-5.22C37.13 39.82 38.53 37.71 37.5 35.62z"/><path fill="#e67a7a" d="M13.152,20.9c-4.191,0.301-6.373,2.483-7.262,4.485c-0.911,2.052-0.962,2.64-0.804,5.389 c3.934,2.501,9.189,2.138,9.189,2.138c2-1.297,3.376-2.9,3.718-4.201C17.021,24.047,13.152,20.9,13.152,20.9z"/><path fill="#e57373" d="M29.43 42.67c-.19.15-.41.22-.63.22-.27 0-.53-.11-.72-.33-.44-.52-.97-2.07-1.27-3.54-.14-.71-.23-1.41-.23-1.95v-.04c.33.01.67.02 1 .04.21-.19.48-.4.79-.61.13.16.21.38.21.61 0 .47.08 1.05.2 1.63.25 1.16.65 2.31.84 2.58C29.92 41.72 29.85 42.35 29.43 42.67zM22.68 37.1c.04.22 0 .46-.13.67-.19.3-.39.83-.56 1.42-.35 1.19-.62 2.63-.62 2.99 0 .55-.45 1-1 1s-1-.45-1-1c0-.56.29-2.16.71-3.56.21-.7.45-1.34.7-1.79.35.13.66.26.92.4C22.02 37.18 22.34 37.14 22.68 37.1zM17.59 36c-.03.29-.2.56-.46.73-.37.23-.8.58-1.24.95-.94.81-1.86 1.76-2.03 2.06-.19.33-.54.53-.9.53-.15 0-.3-.03-.44-.11-.47-.24-.69-.79-.47-1.27.24-.52 1.22-1.54 2.22-2.43.61-.55 1.22-1.04 1.7-1.35.22.25.44.51.63.78C16.89 35.91 17.23 35.95 17.59 36zM25.21 27.101v.01c-.38.02-.72.01-1-.01-.28.17-.58.32-.88.46-.08-.14-.12-.29-.12-.46 0-1.83-.5-4.76-.66-5.24-.17-.52.12-1.08.64-1.25.53-.17 1.09.11 1.26.64C24.68 21.951 25.21 25.071 25.21 27.101zM33.54 25.341c-.34.04-.67.05-1 .04-.26.16-.55.32-.88.46h-.01c-.07-.14-.11-.29-.11-.46 0-1.64-.84-4.56-1.06-5.01-.24-.5-.03-1.1.46-1.34.5-.24 1.1-.04 1.34.46C32.66 20.251 33.53 23.421 33.54 25.341zM42.03 18.311c-.19.28-.41.54-.68.74-.06.32-.14.64-.26.96-.21-.05-.4-.17-.54-.36-.76-.99-2.89-2.21-3.62-2.39-.54-.13-.86-.68-.73-1.21.13-.54.67-.87 1.21-.73C38.51 15.591 40.94 16.981 42.03 18.311zM39.87 7.452c-.1.2-.27.37-.5.46-.47.2-2.25 1.84-2.68 2.39-.2.25-.49.38-.78.38-.22 0-.44-.07-.62-.21-.44-.35-.51-.98-.17-1.41.37-.46 2.24-2.35 3.32-2.92.22.28.41.56.57.84C39.28 7.092 39.58 7.242 39.87 7.452zM30.6 3.232c-.33 1.28-.46 3.49-.38 3.99.08.54-.29 1.05-.84 1.14-.05.01-.1.01-.15.01-.48 0-.91-.35-.99-.85-.13-.85.05-3.33.43-4.79.01-.05.03-.09.04-.13.3.11.61.24.92.38.34-.04.67-.07.99-.08C30.64 3.012 30.63 3.122 30.6 3.232zM22.62 9.162c-.19.14-.4.21-.62.21-.3 0-.59-.13-.79-.38-.31-.41-2.17-3.34-2.42-4.4.32-.12.64-.22.96-.26.21-.22.46-.45.75-.66.11.12.19.28.23.46.15.56 1.67 3.13 2.06 3.62C23.13 8.192 23.05 8.822 22.62 9.162zM14.78 22.53c0 0-7.197 1.262-7.71 9.24-.761-.323-1.34-.59-1.98-1-.16-2.74-.11-3.33.8-5.38.89-2.01 3.07-4.19 7.26-4.49C13.15 20.9 13.87 21.49 14.78 22.53z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/edit.svg b/app/assets/images/icons/edit.svg
new file mode 100644
index 000000000..de8a6230b
--- /dev/null
+++ b/app/assets/images/icons/edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#E57373" d="M42.583,9.067l-3.651-3.65c-0.555-0.556-1.459-0.556-2.015,0l-1.718,1.72l5.664,5.664l1.72-1.718C43.139,10.526,43.139,9.625,42.583,9.067"/><path fill="#FF9800" d="M4.465 21.524H40.471999999999994V29.535H4.465z" transform="rotate(134.999 22.469 25.53)"/><path fill="#B0BEC5" d="M34.61 7.379H38.616V15.392H34.61z" transform="rotate(-45.02 36.61 11.385)"/><path fill="#FFC107" d="M6.905 35.43L5 43 12.571 41.094z"/><path fill="#37474F" d="M5.965 39.172L5 43 8.827 42.035z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/finish.svg b/app/assets/images/icons/finish.svg
new file mode 100644
index 000000000..37ff43b0e
--- /dev/null
+++ b/app/assets/images/icons/finish.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#9fa8da" d="M9,45H6V12c0,0,0.584-5,1.542-5S9,12,9,12V45z"/><path fill="#9fa8da" d="M7.5 3A2.5 2.5 0 1 0 7.5 8A2.5 2.5 0 1 0 7.5 3Z"/><path fill="#e0dddc" d="M6 9H42V33H6z"/><path fill="#546e7a" d="M12 9H18V15H12zM18 15H24V21H18zM36 9H42V15H36zM24 9H30V15H24zM30 15H36V21H30zM12 21H18V27H12zM18 27H24V33H18zM6 15H12V21H6zM6 27H12V33H6zM36 21H42V27H36zM24 21H30V27H24zM30 27H36V33H30z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/garden.svg b/app/assets/images/icons/garden.svg
deleted file mode 100644
index 11b9396f7..000000000
--- a/app/assets/images/icons/garden.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" fill:#2E7D32;" d="M 30 11.5 C 30 14.539063 27.539063 17 24.5 17 C 21.460938 17 19 14.539063 19 11.5 C 19 8.460938 21.460938 6 24.5 6 C 27.539063 6 30 8.460938 30 11.5 Z "/>
-<path style=" fill:#2E7D32;" d="M 41 16.5 C 41 18.984375 38.984375 21 36.5 21 C 34.015625 21 32 18.984375 32 16.5 C 32 14.015625 34.015625 12 36.5 12 C 38.984375 12 41 14.015625 41 16.5 Z "/>
-<path style=" fill:#388E3C;" d="M 22 14 C 22 16.761719 19.761719 19 17 19 C 14.238281 19 12 16.761719 12 14 C 12 11.238281 14.238281 9 17 9 C 19.761719 9 22 11.238281 22 14 Z "/>
-<path style=" fill:#388E3C;" d="M 12 19.5 C 12 21.433594 10.433594 23 8.5 23 C 6.566406 23 5 21.433594 5 19.5 C 5 17.566406 6.566406 16 8.5 16 C 10.433594 16 12 17.566406 12 19.5 Z "/>
-<path style=" fill:#388E3C;" d="M 43 19.5 C 43 21.433594 41.433594 23 39.5 23 C 37.566406 23 36 21.433594 36 19.5 C 36 17.566406 37.566406 16 39.5 16 C 41.433594 16 43 17.566406 43 19.5 Z "/>
-<path style=" fill:#388E3C;" d="M 35 14 C 35 16.761719 32.761719 19 30 19 C 27.238281 19 25 16.761719 25 14 C 25 11.238281 27.238281 9 30 9 C 32.761719 9 35 11.238281 35 14 Z "/>
-<path style=" fill:#4CAF50;" d="M 26 19 C 26 21.761719 23.761719 24 21 24 C 18.238281 24 16 21.761719 16 19 C 16 16.238281 18.238281 14 21 14 C 23.761719 14 26 16.238281 26 19 Z "/>
-<path style=" fill:#4CAF50;" d="M 18 17 C 18 19.761719 15.761719 22 13 22 C 10.238281 22 8 19.761719 8 17 C 8 14.238281 10.238281 12 13 12 C 15.761719 12 18 14.238281 18 17 Z "/>
-<path style=" fill:#4CAF50;" d="M 38 20 C 38 22.210938 36.210938 24 34 24 C 31.789063 24 30 22.210938 30 20 C 30 17.789063 31.789063 16 34 16 C 36.210938 16 38 17.789063 38 20 Z "/>
-<path style=" fill:#9CCC65;" d="M 31 19.5 C 31 21.433594 29.433594 23 27.5 23 C 25.566406 23 24 21.433594 24 19.5 C 24 17.566406 25.566406 16 27.5 16 C 29.433594 16 31 17.566406 31 19.5 Z "/>
-<path style=" fill:#9CCC65;" d="M 18 18.5 C 18 19.878906 16.878906 21 15.5 21 C 14.121094 21 13 19.878906 13 18.5 C 13 17.121094 14.121094 16 15.5 16 C 16.878906 16 18 17.121094 18 18.5 Z "/>
-<path style=" fill:#795548;" d="M 5 20 L 43 20 L 43 42 L 5 42 Z "/>
-<path style=" fill:#4E342E;" d="M 5 26 L 43 26 L 43 28 L 5 28 Z "/>
-<path style=" fill:#4E342E;" d="M 5 34 L 43 34 L 43 36 L 5 36 Z "/>
-<path style=" fill:#8D6E63;" d="M 9 20 L 13 20 L 13 42 L 9 42 Z "/>
-<path style=" fill:#8D6E63;" d="M 35 20 L 39 20 L 39 42 L 35 42 Z "/>
-<path style=" fill:#6D4C41;" d="M 7 20 L 9 20 L 9 42 L 7 42 Z "/>
-<path style=" fill:#6D4C41;" d="M 33 20 L 35 20 L 35 42 L 33 42 Z "/>
-<path style=" fill:#3E2723;" d="M 7 26 L 9 26 L 9 28 L 7 28 Z "/>
-<path style=" fill:#3E2723;" d="M 7 34 L 9 34 L 9 36 L 7 36 Z "/>
-<path style=" fill:#3E2723;" d="M 33 26 L 35 26 L 35 28 L 33 28 Z "/>
-<path style=" fill:#3E2723;" d="M 33 34 L 35 34 L 35 36 L 33 36 Z "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/gardener.svg b/app/assets/images/icons/gardener.svg
new file mode 100644
index 000000000..3f47a2fcd
--- /dev/null
+++ b/app/assets/images/icons/gardener.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144" height="144"><path fill="#3e2723" d="M32 34L16 34 15 18 33 18z"/><path fill="#3f51b5" d="M29,33L29,33l-5,1l-5-1c0,0-11,1.986-11,13h32C40,35.025,29,33,29,33"/><path fill="#ff9800" d="M24 39L19 33 19 27 29 27 29 33z"/><path fill="#4caf50" d="M30,33.254V42H18v-8.748c-0.945,0.28-2.445,0.823-4,1.791V42v2v2h20v-2v-2v-6.941C32.444,34.086,30.944,33.536,30,33.254z"/><path fill="#1b5e20" d="M15,44c0-0.553,0.447-1,1-1c0.552,0,1,0.447,1,1s-0.448,1-1,1C15.447,45,15,44.553,15,44z M32,45c0.552,0,1-0.447,1-1s-0.448-1-1-1c-0.553,0-1,0.447-1,1S31.447,45,32,45z"/><path fill="#ce8b05" d="M24 13A17 5.5 0 1 0 24 24A17 5.5 0 1 0 24 13Z"/><path fill="#fbc02d" d="M28,3c-2,0-2,2-4,2s-2-2-4-2s-6,6.029-6,11v0.059C16.808,13.396,20.257,13,24,13c3.742,0,7.191,0.396,10,1.059V14C34,9.029,30,3,28,3z"/><path fill="#ffb74d" d="M24,15c-4.716,0-7.609,0.906-9,1.499V23c0,4.971,4.028,9,9,9c4.971,0,9-4.029,9-9v-6.501C31.609,15.906,28.716,15,24,15z"/><path fill="#795548" d="M24 15c-7 0-10 2-10 2l0 0-3.747 4.731C9.981 24.408 10 26.766 10 28l6 6V21l10.051-5.935C25.407 15.026 24.73 15 24 15zM37.747 21.731L34 17c0 0-1.551-1.024-4.998-1.606L32 19v15l6-6C38 26.766 38.019 24.408 37.747 21.731z"/><path fill="#ed9f21" d="M14.422,11C14.158,12.004,14,13.023,14,14c0,0,4-1,10-1s10,1,10,1c0-0.977-0.159-1.996-0.423-3c0,0-5.577-1-9.577-1S14.422,11,14.422,11z"/><path fill="#784719" d="M27,23c0-0.551,0.448-1,1-1s1,0.449,1,1s-0.448,1-1,1S27,23.551,27,23 M19,23c0,0.551,0.448,1,1,1s1-0.449,1-1s-0.448-1-1-1S19,22.449,19,23"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/gardens.svg b/app/assets/images/icons/gardens.svg
new file mode 100644
index 000000000..fa71ba208
--- /dev/null
+++ b/app/assets/images/icons/gardens.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#9fa8da" d="M44,29H30V18.029l7-4.546l7,4.546V29z"/><path fill="#0d47a1" d="M39,24h-4v-4h4V24z"/><path fill="#b71c1c" d="M45 17.56L45 21 37 14.44 29 21 29 17.56 37 11z"/><path fill="#9fa8da" d="M18,29H4V18.029l7-4.546l7,4.546V29z"/><path fill="#0d47a1" d="M13,20H9v4h4V20z"/><path fill="#b71c1c" d="M19 17.56L19 21 11 14.44 3 21 3 17.56 11 11z"/><path fill="#e8eaf6" d="M33,31H15V15.571l9-6l9,6V31z"/><path fill="#1565c0" d="M27,18h-6v6h6V18z"/><path fill="#9fa8da" d="M33 18H34V20H33zM14 18H15V20H14z"/><path fill="#d32f2f" d="M34 14.2L34 19 24 10.8 14 19 14 14.2 24 6z"/><path fill="#8bc34a" d="M34.5,27C22.793,27,11.754,27.535,2,28.477V43h44V27.176C42.255,27.062,38.416,27,34.5,27z"/><path fill="#689f38" d="M18.688 27.338C11.93 28.534 6.153 30.466 2 32.891v6.101c6.106-5.784 13.729-9.952 22.202-11.846C22.34 27.197 20.501 27.26 18.688 27.338zM39.379 43c1.637-8.041 3.51-13.562 5.523-15.849-.35-.01-.706-.016-1.057-.024-3.131 2.26-6.019 7.818-8.489 15.873H39.379zM26.579 43c4.07-8.157 8.84-13.753 14.012-15.948-.455-.007-.917-.009-1.374-.015C32.511 29.231 26.39 34.864 21.325 43H26.579zM12.608 43c6.085-8.142 13.693-13.821 22.115-15.998C34.648 27.002 34.575 27 34.5 27c-.556 0-1.103.007-1.656.009C22.392 29.2 13.026 34.899 5.728 43H12.608z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/grass.svg b/app/assets/images/icons/grass.svg
new file mode 100644
index 000000000..9d77d945d
--- /dev/null
+++ b/app/assets/images/icons/grass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#388E3C" d="M20,42.986C20,26.007,27.264,11.928,29,9c-0.852,2.774-3,8-3,34.014L20,42.986z"/><path fill="#388E3C" d="M24,42.975C24,29.27,34.963,13.556,38,11c-1.684,2.342-8,12.291-8,32.025L24,42.975z"/><path fill="#388E3C" d="M19,43c0-17-5.631-25.871-7-28c1.765,1.823,13,16.016,13,28H19z"/><g><path fill="#8BC34A" d="M29 43c0-13.638 11.218-24.641 13-26-1.431 1.717-7 11-7 26H29zM14 43c0-15.034-6.457-24.327-8-26 1.877 1.3 14 12.746 14 26H14z"/></g><g><path fill="#4CAF50" d="M19.428 22.989c.372 1.44.668 2.895.917 4.356 2.538 4.838 4.652 10.449 4.655 15.647l2-.017c-.25-3.555-.745-7.176-1.516-10.682-.777-3.517-1.833-6.964-3.214-10.265-1.376-3.3-3.074-6.455-5.105-9.354C15.124 9.794 12.796 7.09 10 5c2.458 2.462 4.324 5.409 5.879 8.447C17.42 16.501 18.587 19.713 19.428 22.989zM21.001 43c0 .008-.001.017-.001.024L24 43H21.001z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/harvest-add.svg b/app/assets/images/icons/harvest-add.svg
new file mode 100644
index 000000000..f40bc92bc
--- /dev/null
+++ b/app/assets/images/icons/harvest-add.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1">
+<g id="surface1027379">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97.647059%,65.882353%,14.509804%);fill-opacity:1;" d="M 21.292969 15.804688 C 21.242188 16.882812 21.152344 22.007812 21 23 L 25 23 C 25 20 24.566406 16.632812 24.273438 15.476562 C 23.980469 14.335938 23.644531 13.210938 23.246094 12.109375 C 22.453125 9.917969 21.4375 7.769531 20 6 C 20.855469 8.105469 21.167969 10.320312 21.289062 12.511719 C 21.34375 13.609375 21.339844 14.710938 21.292969 15.804688 Z M 19 23 C 19 13.820312 13.316406 10.726562 12.261719 10.203125 C 11.203125 9.6875 10.113281 9.269531 9 9 C 10.953125 10.171875 15 12.835938 15 23 Z M 38 7 C 35.894531 8.191406 33.945312 9.757812 32.296875 11.707031 C 31.476562 12.6875 29 16.75 29 23 L 33 23 C 33 11.707031 36.304688 8.714844 38 7 Z M 29.105469 28 C 29.796875 35.339844 33.992188 41.3125 34.1875 41.582031 L 35.8125 40.421875 C 35.769531 40.359375 32.652344 34.726562 32.09375 28 Z M 15.90625 28 C 15.347656 34.726562 12.230469 40.359375 12.1875 40.421875 L 13.8125 41.582031 C 14.007812 41.3125 18.203125 35.339844 18.894531 28 Z M 24.0625 28 C 24.46875 35.550781 26.941406 43.820312 27.019531 44.195312 L 28.980469 43.804688 C 28.964844 43.714844 27.316406 35.398438 27.039062 28 Z M 20.960938 28 C 20.683594 35.394531 19.039062 43.714844 19.019531 43.804688 L 20.980469 44.199219 C 21.058594 43.820312 23.53125 35.550781 23.9375 28 Z M 34 26 C 34 25.445312 33.554688 25 33 25 L 15 25 C 14.445312 25 14 25.445312 14 26 C 14 26.554688 14.445312 27 15 27 L 33 27 C 33.554688 27 34 26.554688 34 26 Z M 34 26 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(84.705882%,54.117647%,9.803922%);fill-opacity:1;" d="M 18.925781 28 C 18.414062 35.816406 15.140625 42.480469 15.105469 42.554688 L 16.894531 43.449219 C 17.050781 43.136719 21.289062 36.265625 21.914062 28 Z M 16.558594 8.621094 C 17.183594 9.65625 17.601562 10.785156 17.863281 11.9375 C 18.128906 13.09375 18.242188 14.273438 18.253906 15.457031 C 18.253906 15.851562 18.246094 16.675781 18.230469 17.644531 C 18.695312 19.144531 19 20.90625 19 23 L 21 23 C 21.152344 22.007812 21.242188 16.882812 21.292969 15.804688 C 21.300781 15.660156 21.296875 15.515625 21.304688 15.371094 C 21.273438 15.234375 21.246094 15.109375 21.21875 15.011719 C 20.851562 13.703125 20.371094 12.421875 19.730469 11.222656 C 19.09375 10.027344 18.296875 8.910156 17.332031 7.992188 C 16.367188 7.078125 15.238281 6.324219 14 6 C 15.101562 6.632812 15.925781 7.597656 16.558594 8.621094 Z M 25 23 L 29.5 23 L 29 23 C 29 21.511719 29.144531 20.152344 29.367188 18.925781 C 29.363281 17.339844 29.398438 15.78125 29.472656 15.144531 C 29.617188 13.835938 29.921875 12.523438 30.363281 11.234375 C 30.804688 9.945312 31.386719 8.679688 32.074219 7.464844 C 32.769531 6.253906 33.5625 5.074219 34.5 4 C 33.335938 4.828125 32.265625 5.8125 31.269531 6.871094 C 30.277344 7.9375 29.363281 9.101562 28.566406 10.359375 C 27.765625 11.621094 27.082031 12.980469 26.558594 14.429688 C 26.265625 15.226562 25.972656 17.144531 25.769531 19.042969 C 25.707031 17.40625 25.652344 15.777344 25.617188 15.136719 C 25.546875 13.855469 25.539062 12.570312 25.632812 11.289062 C 25.726562 10.011719 25.914062 8.738281 26.28125 7.5 C 26.644531 6.265625 27.183594 5.058594 28 4 C 26.941406 4.820312 26.070312 5.910156 25.363281 7.097656 C 24.65625 8.285156 24.113281 9.574219 23.671875 10.890625 C 23.542969 11.269531 23.417969 11.738281 23.296875 12.257812 C 23.671875 13.3125 23.996094 14.386719 24.273438 15.476562 C 24.566406 16.632812 25 20 25 23 Z M 14.8125 28 C 13.855469 33.394531 9.410156 37.191406 9.359375 37.234375 L 10.640625 38.769531 C 10.875 38.574219 15.898438 34.296875 16.835938 28 Z M 33.1875 28 L 31.164062 28 C 32.101562 34.300781 37.125 38.574219 37.359375 38.769531 L 38.640625 37.234375 C 38.589844 37.191406 34.144531 33.394531 33.1875 28 Z M 26.085938 28 C 26.710938 36.265625 30.949219 43.136719 31.105469 43.449219 L 32.894531 42.554688 C 32.859375 42.480469 29.585938 35.816406 29.074219 28 Z M 23 28 L 25 28 L 25 44 L 23 44 Z M 23 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(76.862745%,47.058824%,7.843137%);fill-opacity:1;" d="M 34 24 C 34 24.554688 33.554688 25 33 25 L 15 25 C 14.445312 25 14 24.554688 14 24 C 14 23.445312 14.445312 23 15 23 L 33 23 C 33.554688 23 34 23.445312 34 24 Z M 34 28 C 34 28.554688 33.554688 29 33 29 L 15 29 C 14.445312 29 14 28.554688 14 28 C 14 27.445312 14.445312 27 15 27 L 33 27 C 33.554688 27 34 27.445312 34 28 Z M 34 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(26.27451%,62.745098%,27.843137%);fill-opacity:1;" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36 "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/harvest.svg b/app/assets/images/icons/harvest.svg
index e941e9e92..8b536cc22 100644
--- a/app/assets/images/icons/harvest.svg
+++ b/app/assets/images/icons/harvest.svg
@@ -1,5 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" " d="M 7.304688 4 L 4.664063 11.042969 L 6.804688 11.042969 L 8.695313 6 L 23.308594 6 L 25.199219 11.042969 L 27.332031 11.042969 L 24.691406 4 Z M 2 12 L 2 18 L 3.257813 18 L 6.257813 28 L 25.746094 28 L 28.746094 18 L 30 18 L 30 12 Z M 4 14 L 28 14 L 28 16 L 27.253906 16 L 24.253906 26 L 7.742188 26 L 4.742188 16 L 4 16 Z M 11 17 L 11 24 L 13 24 L 13 17 Z M 15 17 L 15 24 L 17 24 L 17 17 Z M 19 17 L 19 24 L 21 24 L 21 17 Z "/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#F9A825" d="M21.293 15.803C21.242 16.881 21.154 22.008 21 23h4c0-2.999-.435-6.369-.725-7.523-.293-1.141-.632-2.265-1.028-3.366C22.452 9.918 21.439 7.77 20 6c.857 2.105 1.168 4.32 1.288 6.513C21.344 13.611 21.341 14.71 21.293 15.803zM19 23c0-9.18-5.682-12.275-6.737-12.797C11.204 9.686 10.114 9.271 9 9.001c1.952 1.171 6 3.833 6 13.999H19zM38 7c-2.107 1.193-4.054 2.756-5.703 4.706C31.478 12.687 29 16.751 29 22.999h4C33 11.706 36.305 8.713 38 7zM29.106 28c.69 7.338 4.886 13.311 5.08 13.582l1.628-1.162c-.045-.062-3.163-5.695-3.721-12.42H29.106zM15.907 28c-.558 6.725-3.677 12.358-3.721 12.42l1.628 1.162c.194-.271 4.39-6.244 5.081-13.582H15.907zM24.062 28c.406 7.549 2.881 15.819 2.958 16.197l1.961-.393C28.963 43.714 27.316 35.4 27.04 28H24.062zM20.96 28c-.276 7.396-1.922 15.714-1.94 15.805l1.961.393c.076-.378 2.551-8.648 2.958-16.197H20.96zM34 26c0-.553-.447-1-1-1H15c-.553 0-1 .447-1 1l0 0c0 .553.447 1 1 1h18C33.553 27 34 26.553 34 26L34 26z"/><g><path fill="#D88A19" d="M18.926 28c-.511 7.815-3.785 14.482-3.821 14.555l1.789.894c.156-.311 4.395-7.183 5.021-15.448H18.926zM16.557 8.622c.626 1.034 1.043 2.164 1.308 3.317.265 1.154.376 2.336.387 3.518.003.394-.005 1.218-.023 2.187C18.696 19.146 19 20.907 19 23h2c.154-.992.242-6.119.293-7.197.006-.143.005-.287.01-.43-.029-.137-.057-.262-.085-.362-.366-1.308-.848-2.59-1.486-3.788-.637-1.197-1.434-2.311-2.4-3.232C16.368 7.08 15.238 6.324 14 6 15.103 6.632 15.927 7.599 16.557 8.622zM25 23h.5H26h3.5c0 0 0 0 0-.001H29c0-1.486.143-2.845.368-4.072-.003-1.586.03-3.146.103-3.784.147-1.306.451-2.62.894-3.908.441-1.289 1.02-2.554 1.71-3.77C32.77 6.252 33.562 5.073 34.5 4c-1.166.829-2.233 1.811-3.23 2.871-.993 1.065-1.905 2.229-2.704 3.489s-1.483 2.622-2.009 4.071c-.292.794-.583 2.714-.786 4.611-.065-1.635-.118-3.264-.154-3.905-.072-1.282-.079-2.566.014-3.846.094-1.278.285-2.554.65-3.791C26.645 6.267 27.182 5.06 28 4c-1.057.822-1.931 1.912-2.635 3.098-.708 1.188-1.253 2.475-1.694 3.791-.128.38-.253.849-.375 1.369.374 1.055.699 2.129.979 3.219C24.565 16.631 25 20.001 25 23zM14.811 28c-.954 5.393-5.402 9.191-5.452 9.233l1.281 1.536c.235-.196 5.258-4.471 6.196-10.77H14.811zM33.189 28h-2.025c.938 6.299 5.961 10.573 6.195 10.77l1.282-1.536C38.591 37.191 34.143 33.393 33.189 28zM26.084 28c.627 8.266 4.866 15.138 5.021 15.448l1.789-.894c-.036-.072-3.31-6.739-3.821-14.555H26.084zM23 28H25V44H23z"/></g><g><path fill="#C47814" d="M34 24c0 .553-.447 1-1 1H15c-.553 0-1-.447-1-1l0 0c0-.553.447-1 1-1h18C33.553 23 34 23.447 34 24L34 24zM34 28c0 .553-.447 1-1 1H15c-.553 0-1-.447-1-1l0 0c0-.553.447-1 1-1h18C33.553 27 34 27.447 34 28L34 28z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/home.svg b/app/assets/images/icons/home.svg
deleted file mode 100644
index ae5dc8d22..000000000
--- a/app/assets/images/icons/home.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" " d="M 16 2.59375 L 15.28125 3.28125 L 2.28125 16.28125 L 3.71875 17.71875 L 5 16.4375 L 5 28 L 14 28 L 14 18 L 18 18 L 18 28 L 27 28 L 27 16.4375 L 28.28125 17.71875 L 29.71875 16.28125 L 16.71875 3.28125 Z M 16 5.4375 L 25 14.4375 L 25 26 L 20 26 L 20 16 L 12 16 L 12 26 L 7 26 L 7 14.4375 Z "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/hose.svg b/app/assets/images/icons/hose.svg
new file mode 100644
index 000000000..448d1cd78
--- /dev/null
+++ b/app/assets/images/icons/hose.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#2196F3" d="M37.891,11.663c0.919,0.613,2.16,0.364,2.773-0.555s0.364-2.161-0.555-2.773c-0.919-0.613-4.387-0.419-4.387-0.419S36.972,11.051,37.891,11.663z"/><path fill="#4CAF50" d="M37.5,21H10v3h27.5c0.827,0,1.5,0.673,1.5,1.5S38.327,27,37.5,27H10v3h27.5c2.481,0,4.5-2.019,4.5-4.5S39.981,21,37.5,21z"/><path fill="#4CAF50" d="M38,33H10.5C9.673,33,9,32.327,9,31.5S9.673,30,10.5,30H38v-3H10.5C8.019,27,6,29.019,6,31.5S8.019,36,10.5,36H38V33z"/><path fill="#4CAF50" d="M37.5 33H10v3h27.5c.827 0 1.5.673 1.5 1.5S38.327 39 37.5 39H6v3h31.5c2.481 0 4.5-2.019 4.5-4.5S39.981 33 37.5 33zM9 19.5c0-.176-3-.171-3 0 0 2.481 2.019 4.5 4.5 4.5H38v-3H10.5C9.673 21 9 20.327 9 19.5z"/><path fill="#4CAF50" d="M9,19.437H6c0-5.107,4.173-6.213,10.491-7.887c1.644-0.436,9.91-2.885,11.98-3.506l0.863,2.873c-2.118,0.636-10.409,3.092-12.075,3.533C10.459,16.252,9,16.879,9,19.437z"/><path fill="#37474F" d="M33.423 9.619L26.992 12.563 25.577 7.766 32.573 6.744z"/><path fill="#2E7D32" d="M27.275,13.521c0.156,0.528-0.146,1.085-0.675,1.242l-0.96,0.282c-0.529,0.158-1.086-0.146-1.242-0.676l-1.982-6.712c-0.156-0.531,0.146-1.088,0.676-1.243l0.959-0.284c0.529-0.155,1.085,0.148,1.242,0.676L27.275,13.521z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/insect.svg b/app/assets/images/icons/insect.svg
new file mode 100644
index 000000000..635b3259b
--- /dev/null
+++ b/app/assets/images/icons/insect.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#37474f" d="M29 19c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l5.4-2.7V8.5l4.4-3.3c.4-.3 1.1-.2 1.4.2.3.4.2 1.1-.2 1.4L36 9.5v6.1l-6.6 3.3C29.3 19 29.2 19 29 19zM19 19c-.1 0-.3 0-.4-.1L12 15.6V9.5L8.4 6.8C8 6.5 7.9 5.8 8.2 5.4c.3-.4 1-.5 1.4-.2L14 8.5v5.9l5.4 2.7c.5.2.7.8.4 1.3C19.7 18.8 19.4 19 19 19zM38 42c-.2 0-.3 0-.4-.1l-6.5-3.2-1-7.9-2.4-.8c-.5-.2-.8-.7-.6-1.3.2-.5.7-.8 1.3-.6l3.6 1.2 1 8.1 5.5 2.8c.5.2.7.8.4 1.3C38.7 41.8 38.4 42 38 42zM41 35c-.2 0-.3 0-.4-.1l-4.5-2.2-1-8.9-5.4-1.8c-.5-.2-.8-.7-.6-1.3.2-.5.7-.8 1.3-.6l6.6 2.2 1 9.1 3.5 1.8c.5.2.7.8.4 1.3C41.7 34.8 41.4 35 41 35zM10 42c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l5.5-2.8 1-8.1 3.6-1.2c.5-.2 1.1.1 1.3.6.2.5-.1 1.1-.6 1.3l-2.4.8-1 7.9-6.5 3.2C10.3 42 10.2 42 10 42zM7 35c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l3.5-1.8 1-9.1 6.6-2.2c.5-.2 1.1.1 1.3.6.2.5-.1 1.1-.6 1.3l-5.4 1.8-1 8.9-4.5 2.2C7.3 35 7.2 35 7 35zM28 16c0 1.1-.9 2-2 2h-4c-1.1 0-2-.9-2-2v-3c0-1.1.9-2 2-2h4c1.1 0 2 .9 2 2V16z"/><path fill="#37474f" d="M25,12h-2V8.3l0.7-0.2C23.8,8,26,7.2,26,5h2c0,2.7-1.9,4.1-3,4.6V12z"/><path fill="#37474f" d="M23.7,9.9C23.5,9.9,20,8.7,20,5h2c0,2.2,2.2,3,2.3,3.1L23.7,9.9z"/><path fill="#8bc34a" d="M15.9,34c0,0,1,8,8.1,8c7.1,0,8.1-8,8.1-8l0.8-8c0,0,0.2-2-1.9-2c-2,0-12.2,0-14.3,0 c-2,0-1.9,2-1.9,2L15.9,34z"/><path fill="#2e7d32" d="M25,24c-0.7,0-1.3,0-2,0v17.9c0.3,0,0.6,0.1,1,0.1s0.7,0,1-0.1V24z"/><path fill="#43a047" d="M29 40.1V24c-.6 0-1.3 0-2 0v17.4C27.8 41.1 28.5 40.6 29 40.1zM32.2 34l.8-8c0 0 .3-2-2-2v13.6C31.9 35.9 32.2 34 32.2 34zM21 41.4V24c-.7 0-1.4 0-2 0v16.1C19.6 40.6 20.2 41.1 21 41.4zM15 26l.8 8c0 0 .3 1.9 1.1 3.5V24C14.8 24 15 26 15 26z"/><path fill="#2e7d32" d="M25,14H23c-5.9,0-8,3.8-8,8c0,1.9,2.2,2,2.2,2h13.6c0,0,2.2,0,2.2-1.9C33,17.8,30.9,14,25,14z"/><path fill="#09350b" d="M21,24c0,0,1-2,3-2s3,2,3,2c-2,0-3,6-3,6S23,24,21,24z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/ladybird.svg b/app/assets/images/icons/ladybird.svg
new file mode 100644
index 000000000..a580ccae1
--- /dev/null
+++ b/app/assets/images/icons/ladybird.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#5d4037" d="M27,13c0,1.7-1.3,3-3,3s-3-1.3-3-3l-2-2c0-1.7,3.3-4,5-4s5,2.3,5,4L27,13z"/><path fill="#5d4037" d="M17 15l5 2h4l5-2c0-3-2-4-2-4H19C19 11 17 12 17 15zM41 29c-.1 0-.2 0-.3-.1l-6.6-2.2L33 20.2c-.1-.5.3-1.1.8-1.2.5-.1 1.1.3 1.2.8l.9 5.4 5.4 1.8c.5.2.8.7.6 1.3C41.8 28.7 41.4 29 41 29zM41 42c-.2 0-.3 0-.4-.1l-4.4-2.2-2.1-6.4c-.2-.5.1-1.1.6-1.3.5-.2 1.1.1 1.3.6l1.9 5.6 3.6 1.8c.5.2.7.8.4 1.3C41.7 41.8 41.4 42 41 42zM7 29c-.4 0-.8-.3-.9-.7-.2-.5.1-1.1.6-1.3l5.4-1.8.9-5.4c.1-.5.6-.9 1.2-.8.5.1.9.6.8 1.2l-1.1 6.6L7.3 29C7.2 29 7.1 29 7 29zM7 42c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l3.6-1.8 1.9-5.6c.2-.5.7-.8 1.3-.6.5.2.8.7.6 1.3l-2.1 6.4-4.4 2.2C7.3 42 7.2 42 7 42z"/><path fill="#5d4037" d="M37.6,19H24c-0.6,0-1-0.4-1-1s0.4-1,1-1h12.4l2.7-4.5c0.3-0.5,0.9-0.6,1.4-0.3 c0.5,0.3,0.6,0.9,0.3,1.4L37.6,19z"/><path fill="#5d4037" d="M24 19H10.4l-3.3-5.5C6.9 13 7 12.4 7.5 12.1 8 11.9 8.6 12 8.9 12.5l2.7 4.5H24c.6 0 1 .4 1 1S24.6 19 24 19zM23 10c-.3 0-.5-.1-.7-.3C22.2 9.6 20.5 8 17 8c-.6 0-1-.4-1-1s.4-1 1-1c4.4 0 6.6 2.2 6.7 2.3.4.4.4 1 0 1.4C23.5 9.9 23.3 10 23 10z"/><path fill="#5d4037" d="M25,10c-0.3,0-0.5-0.1-0.7-0.3c-0.4-0.4-0.4-1,0-1.4C24.4,8.2,26.6,6,31,6c0.6,0,1,0.4,1,1 s-0.4,1-1,1c-3.5,0-5.2,1.6-5.3,1.7C25.5,9.9,25.3,10,25,10z"/><path fill="#b71c1c" d="M23,20h2v22h-2V20z"/><path fill="#ff3d00" d="M15.2,17c-2.4,2.4-4.2,5.8-4.2,10c0,8.8,7.7,15,12,15l1-23l1,23c4.3,0,12-6.2,12-15 c0-4.2-1.8-7.6-4.2-10H15.2z"/><path fill="#3e2723" d="M24 22c2.8 0 5-2.2 5-5H19C19 19.8 21.2 22 24 22zM32 28.5c0 1.4-1.1 2.5-2.5 2.5S27 29.9 27 28.5s1.1-2.5 2.5-2.5S32 27.1 32 28.5zM21 28.5c0 1.4-1.1 2.5-2.5 2.5S16 29.9 16 28.5s1.1-2.5 2.5-2.5S21 27.1 21 28.5zM13.3 22.4c-.5 1-.4 2.1.4 2.5.7.4 1.7-.1 2.3-1.1.5-1 .4-2.1-.4-2.5C14.8 20.9 13.8 21.4 13.3 22.4zM34.9 22.4c-.5-1-1.5-1.4-2.3-1.1s-.9 1.5-.4 2.5c.5 1 1.5 1.4 2.3 1.1C35.3 24.5 35.5 23.4 34.9 22.4zM29.4 37.6c.6.6 1.7.4 2.5-.4s.9-1.9.4-2.5-1.7-.4-2.5.4S28.8 37.1 29.4 37.6zM19.2 37.6c.6-.6.4-1.7-.4-2.5s-1.9-.9-2.5-.4-.4 1.7.4 2.5S18.6 38.2 19.2 37.6z"/><path fill="#a1887f" d="M29 11h-2v2c0 .6.4 1 1 1h2.9C30.5 11.8 29 11 29 11zM19 11h2v2c0 .6-.4 1-1 1h-2.9C17.5 11.8 19 11 19 11z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/notification.svg b/app/assets/images/icons/notification.svg
new file mode 100644
index 000000000..462ba7e9b
--- /dev/null
+++ b/app/assets/images/icons/notification.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#DB8509" d="M24 34.001A4 4 0 1 0 24 42.001 4 4 0 1 0 24 34.001zM26 11c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2V7c0-1.104.896-2 2-2l0 0c1.104 0 2 .896 2 2V11z"/><path fill="#BC6F0A" d="M27.887,38.91C27.955,38.617,28,38.314,28,38.001c0-0.383-0.07-0.746-0.172-1.097C26.609,36.965,25.333,37,24,37s-2.609-0.035-3.829-0.096C20.071,37.255,20,37.618,20,38.001c0,0.313,0.045,0.616,0.113,0.909C21.584,38.979,22.926,39,24,39S26.416,38.979,27.887,38.91z"/><path fill="#FFC107" d="M33,33V16.801c0-4.97-4.029-9-9-9s-9,4.03-9,9V33H33z"/><path fill="#FFC107" d="M41,33c0,2.209-7.059,4-17,4S7,35.209,7,33s7.059-4,17-4S41,30.791,41,33z"/><path fill="#FFC107" d="M7,33c0-1.999,8-9.001,8-12s18-3.001,18,0s8,9.999,8,12S7,34.999,7,33z"/><path fill="#FFE082" d="M9.275,29.424c-0.491,0.593-0.929,1.146-1.295,1.65c1.622,0.655,8.15,3.062,16.562,3.062c4.746,0,10.089-0.78,15.476-3.064c-0.362-0.499-0.796-1.046-1.281-1.632C25.699,34.724,12.698,30.68,9.275,29.424z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/photo.svg b/app/assets/images/icons/photo.svg
new file mode 100644
index 000000000..f002aa3f4
--- /dev/null
+++ b/app/assets/images/icons/photo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 48 48" width="48" height="48"><path fill="#64B5F6" d="M12.3 12.3H40.3V40.3H12.3z" transform="rotate(18.558 26.274 26.27)"/><path fill="#1E88E5" d="M15.6 15.4H37.6V35.4H15.6z" transform="rotate(18.042 26.563 25.412)"/><path fill="#90CAF9" d="M8.1 8.1H36.1V36.1H8.1z" transform="rotate(10.454 22.134 22.135)"/><path fill="#42A5F5" d="M11.3 11.2H33.3V31.2H11.3z" transform="rotate(10.068 22.284 21.207)"/><path fill="#BBDEFB" d="M4 4H32V32H4z"/><path fill="#4CAF50" d="M7 7H29V27H7z"/><path fill="#FFF" d="M16 13c0-1.1.9-2 2-2s2 .9 2 2-2 4-2 4S16 14.1 16 13zM20 21c0 1.1-.9 2-2 2s-2-.9-2-2 2-4 2-4S20 19.9 20 21z"/><path fill="#FFF" d="M13.5 16.7c-1-.6-1.3-1.8-.7-2.7.6-1 1.8-1.3 2.7-.7 1 .6 2.5 3.7 2.5 3.7S14.5 17.3 13.5 16.7zM22.5 17.3c1 .6 1.3 1.8.7 2.7-.6 1-1.8 1.3-2.7.7C19.5 20.2 18 17 18 17S21.5 16.7 22.5 17.3z"/><path fill="#FFF" d="M22.5 16.7c1-.6 1.3-1.8.7-2.7-.6-1-1.8-1.3-2.7-.7C19.5 13.8 18 17 18 17S21.5 17.3 22.5 16.7zM13.5 17.3c-1 .6-1.3 1.8-.7 2.7.6 1 1.8 1.3 2.7.7 1-.6 2.5-3.7 2.5-3.7S14.5 16.7 13.5 17.3z"/><path fill="#FFC107" d="M18 15A2 2 0 1 0 18 19A2 2 0 1 0 18 15Z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant-seeds.svg b/app/assets/images/icons/plant-seeds.svg
deleted file mode 100644
index 86fc2a6c7..000000000
--- a/app/assets/images/icons/plant-seeds.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="100" height="100" fill="000000">
-    <path d="M 12.457031 4 C 12.303766 4.0054531 12.180109 4.0547969 12.099609 4.1542969 C 11.777609 4.5522969 12.255016 5.5897031 13.166016 6.4707031 C 14.077016 7.3517031 15.076437 7.7427031 15.398438 7.3457031 C 15.720438 6.9477031 15.243031 5.9102969 14.332031 5.0292969 C 13.648781 4.3685469 12.916828 3.9836406 12.457031 4 z M 18.273438 7.0078125 C 17.745498 7.0965566 17.100062 7.9065781 16.742188 8.9863281 C 16.333187 10.220328 16.453766 11.339375 17.009766 11.484375 C 17.565766 11.629375 18.348813 10.745719 18.757812 9.5117188 C 19.166812 8.2777187 19.046234 7.160625 18.490234 7.015625 C 18.420734 6.9975 18.348857 6.9951348 18.273438 7.0078125 z M 10.966797 9.0019531 C 10.493797 8.9824531 10.145656 9.0859531 10.035156 9.3144531 C 9.8141562 9.7714531 10.626609 10.561125 11.849609 11.078125 C 13.072609 11.595125 14.243844 11.643547 14.464844 11.185547 C 14.685844 10.728547 13.873391 9.938875 12.650391 9.421875 C 12.038891 9.163375 11.439797 9.0214531 10.966797 9.0019531 z M 3 14 L 3 16 L 9.203125 16 C 9.709475 19.363146 12.49988 22 16 22 C 19.50012 22 22.290525 19.363146 22.796875 16 L 29 16 L 29 14 L 21 14 L 21 15 C 21 17.773666 18.773666 20 16 20 C 13.226334 20 11 17.773666 11 15 L 11 14 L 3 14 z M 15.830078 14.001953 A 2.5 0.99900001 0.361 0 0 13.5 14.984375 A 2.5 0.99900001 0.361 0 0 15.994141 15.998047 A 2.5 0.99900001 0.361 0 0 18.5 15.015625 A 2.5 0.99900001 0.361 0 0 16.005859 14.001953 A 2.5 0.99900001 0.361 0 0 15.830078 14.001953 z M 7 17 A 1 1 0 0 0 6 18 A 1 1 0 0 0 7 19 A 1 1 0 0 0 8 18 A 1 1 0 0 0 7 17 z M 25 17 A 1 1 0 0 0 24 18 A 1 1 0 0 0 25 19 A 1 1 0 0 0 26 18 A 1 1 0 0 0 25 17 z M 4 20 A 1 1 0 0 0 3 21 A 1 1 0 0 0 4 22 A 1 1 0 0 0 5 21 A 1 1 0 0 0 4 20 z M 10 20 A 1 1 0 0 0 9 21 A 1 1 0 0 0 10 22 A 1 1 0 0 0 11 21 A 1 1 0 0 0 10 20 z M 22 20 A 1 1 0 0 0 21 21 A 1 1 0 0 0 22 22 A 1 1 0 0 0 23 21 A 1 1 0 0 0 22 20 z M 28 20 A 1 1 0 0 0 27 21 A 1 1 0 0 0 28 22 A 1 1 0 0 0 29 21 A 1 1 0 0 0 28 20 z M 7 23 A 1 1 0 0 0 6 24 A 1 1 0 0 0 7 25 A 1 1 0 0 0 8 24 A 1 1 0 0 0 7 23 z M 13 23 A 1 1 0 0 0 12 24 A 1 1 0 0 0 13 25 A 1 1 0 0 0 14 24 A 1 1 0 0 0 13 23 z M 19 23 A 1 1 0 0 0 18 24 A 1 1 0 0 0 19 25 A 1 1 0 0 0 20 24 A 1 1 0 0 0 19 23 z M 25 23 A 1 1 0 0 0 24 24 A 1 1 0 0 0 25 25 A 1 1 0 0 0 26 24 A 1 1 0 0 0 25 23 z M 4 26 A 1 1 0 0 0 3 27 A 1 1 0 0 0 4 28 A 1 1 0 0 0 5 27 A 1 1 0 0 0 4 26 z M 10 26 A 1 1 0 0 0 9 27 A 1 1 0 0 0 10 28 A 1 1 0 0 0 11 27 A 1 1 0 0 0 10 26 z M 16 26 A 1 1 0 0 0 15 27 A 1 1 0 0 0 16 28 A 1 1 0 0 0 17 27 A 1 1 0 0 0 16 26 z M 22 26 A 1 1 0 0 0 21 27 A 1 1 0 0 0 22 28 A 1 1 0 0 0 23 27 A 1 1 0 0 0 22 26 z M 28 26 A 1 1 0 0 0 27 27 A 1 1 0 0 0 28 28 A 1 1 0 0 0 29 27 A 1 1 0 0 0 28 26 z"/>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/bark.svg b/app/assets/images/icons/plant_parts/bark.svg
new file mode 100644
index 000000000..f1f1af1ed
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/bark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#cfd8dc" d="M20 5H24V43H20z"/><path fill="#b0bec5" d="M24 5H28V43H24z" transform="rotate(-180 26 24)"/><path fill="#455a64" d="M28 11L25 11 25 10 26 9 28 9zM20 16L23 16 23 15 22 14 20 14zM28 22L25 22 25 21 26 20 28 20zM20 27L23 27 23 26 22 25 20 25zM28 34L25 34 25 33 26 32 28 32zM20 39L23 39 23 38 22 37 20 37z"/><path fill="#cfd8dc" d="M38 5L32 5 35 43 41 43z"/><path fill="#b0bec5" d="M38 5L35 5 38 43 41 43z"/><path fill="#455a64" d="M38 34L40.175 34 40.025 32 39 32 38 33zM37 9L36 10 36 11 38.45 11 38.3 9zM37 39L37 38 36 37 34.4 37 34.55 39zM38 20L37 21 37 22 39.275 22 39.125 20zM36 27L36 26 35 25 33.5 25 33.65 27zM32.825 16L35 16 35 15 34 14 32.675 14z"/><path fill="#cfd8dc" d="M13,5H7c0,0,3,13.047,3,38h6C16,18.047,13,5,13,5z"/><path fill="#b0bec5" d="M13,5h-3c0,0,3,13.047,3,38h3C16,18.047,13,5,13,5z"/><g><path fill="#455a64" d="M8.538 16H11v-1l-1-1H8.314C8.388 14.636 8.463 15.302 8.538 16zM12 27v-1l-1-1H9.327c.045.652.089 1.32.13 2H12zM11 10v1h2.939c-.098-.733-.192-1.397-.28-2H12L11 10zM13 20l-1 1v1h3.101c-.056-.684-.112-1.354-.17-2H13zM13 34h2.801c-.025-.677-.052-1.344-.08-2H14l-1 1V34zM13 38l-1-1H9.894c.017.658.033 1.324.046 2H13V38z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/bulb.svg b/app/assets/images/icons/plant_parts/bulb.svg
new file mode 100644
index 000000000..48b62c4ce
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/bulb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#f3e5f5" d="M29,3c0,9,9,10,8.5,21c-0.3,7.4-6,13.5-13.5,13.5S10.3,31.4,10,24c-0.5-11,9-12,9-21"/><path fill="#9c27b0" d="M24,39c-8.3,0-15-6.7-15-15c0-6.1,2.7-9.4,5.1-12.3C16.2,9.1,18,6.9,18,3h2c0,4.6-2.2,7.3-4.4,10 c-2.3,2.8-4.6,5.6-4.6,11c0,7.2,5.8,13,13,13c7.2,0,13-5.8,13-13c0-5.4-2.3-8.3-4.6-11C30.2,10.3,28,7.6,28,3h2 c0,3.9,1.8,6.1,3.9,8.7C36.3,14.6,39,17.9,39,24C39,32.3,32.3,39,24,39z"/><path fill="#e1bee7" d="M24,37c-6.1,0-11-4.9-11-11c0-4.3,1.5-6.7,3.1-9.2C18,13.7,20,10.5,20,3h2c0,8.1-2.2,11.7-4.2,14.8 C16.3,20.2,15,22.3,15,26c0,5,4,9,9,9c5,0,9-4,9-9c0-3.7-1.3-5.8-2.8-8.1C28.2,14.7,26,11.1,26,3h2c0,7.5,2,10.7,3.9,13.8 c1.6,2.5,3.1,4.9,3.1,9.2C35,32.1,30.1,37,24,37z"/><path fill="#e1bee7" d="M24,35c-3.9,0-7-3.1-7-7c0-1.3,0.5-2.9,1.3-5.1C19.7,18.6,21.9,12.2,22,3l2,0 c-0.1,9.5-2.3,16.1-3.8,20.5c-0.7,2-1.2,3.5-1.2,4.5c0,2.8,2.2,5,5,5s5-2.2,5-5c0-1.7-0.7-3.6-1.5-6.1C26,17.7,24,11.9,24,3h2 c0,8.6,1.9,14.2,3.4,18.3C30.3,23.9,31,26,31,28C31,31.9,27.9,35,24,35z"/><path fill="#e1bee7" d="M21,30c0-1.7,3-13,3-13s3,11.3,3,13s-1.3,3-3,3S21,31.7,21,30z"/><path fill="#ab47bc" d="M22,31c0-1.1,2-7,2-7s2,5.9,2,7s-0.9,2-2,2S22,32.1,22,31z"/><path fill="#5d4037" d="M26.9,36.7C26,36.9,25,37,24,37s-2-0.1-2.9-0.3L19,42l2.7-3.2L21,44l2.2-5.1L24,45l0.8-6.1L27,44 l-0.7-5.2L29,42L26.9,36.7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/flower.svg b/app/assets/images/icons/plant_parts/flower.svg
new file mode 100644
index 000000000..2aed72c48
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/flower.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 48 48"><g data-name="Flower Doodle"><path fill="#ff738d" d="M12.515,10.805a81.876,81.876,0,0,1,8.275,6.9c-.01,0-1.26.642-1.26.642-1.667,1.085-1.547,1.525-2.187,3.5s-1,2.265-.285,4.113l.642,1.26a77.654,77.654,0,0,1-9.487.072c-1.952-.218-3.575-.382-4.755-1.545A4.334,4.334,0,0,1,3.1,20.364c1.707-2.415,3.658-5.423,3.423-7.3-.216-1.677.3-3.275,2.187-3.495A6.45,6.45,0,0,1,12.515,10.805Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.4,23.787a25.847,25.847,0,0,0,6.325-.048"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12.872,16.179s4.161,2.3,5.089,3.756"/><circle cx="7.238" cy="23.811" r="1" fill="#ff3d63"/><circle cx="10.685" cy="19.674" r="1" fill="#ff3d63"/><circle cx="10.328" cy="14.3" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M9.309,9.574A2.044,2.044,0,0,0,8,12a10.492,10.492,0,0,1-2,7c-.92,1.31-2.593,4.431-1,6,1.179,1.161,5.05.787,7,1a35.11,35.11,0,0,0,5.122.076L17.7,27.21a78.969,78.969,0,0,1-9.487.072c-1.95-.213-3.576-.384-4.755-1.545A4.338,4.338,0,0,1,3.1,20.364c1.708-2.41,3.655-5.426,3.423-7.3-.212-1.677.3-3.278,2.187-3.495A2.4,2.4,0,0,1,9.309,9.574Z"/><path fill="#ff738d" d="M7.9,30.845a81.911,81.911,0,0,1,9.114-5.739c-.006.008.221,1.4.221,1.4.517,1.92.973,1.942,2.649,3.16s1.845,1.65,3.823,1.542l1.4-.221a77.62,77.62,0,0,1-2.863,9.045c-.811,1.789-1.468,3.281-2.939,4.045a4.334,4.334,0,0,1-5.22-1.321c-1.77-2.37-4.027-5.155-5.885-5.512-1.662-.312-3.022-1.3-2.648-3.16A6.449,6.449,0,0,1,7.9,30.845Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19.6,36.868A25.861,25.861,0,0,0,21.5,30.839"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.123,32.166s3.47-3.247,5.144-3.678"/><circle cx="18.641" cy="39.883" r="1" fill="#ff3d63"/><circle cx="15.771" cy="35.326" r="1" fill="#ff3d63"/><circle cx="10.55" cy="34.005" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M5.74,33.514C6,35,6.21,34.846,7,35c1.854.358,4.877,2.59,6.641,4.959C14.6,41.239,17.015,44.03,19,43c1.469-.762,2-3.977,2.8-5.765a55,55,0,0,0,2.048-6.052l1.257-.2a79.012,79.012,0,0,1-2.863,9.045c-.8,1.788-1.47,3.282-2.939,4.045a4.338,4.338,0,0,1-5.22-1.321c-1.765-2.37-4.031-5.154-5.885-5.512-1.661-.316-3.026-1.3-2.648-3.16A2.39,2.39,0,0,1,5.74,33.514Z"/><path fill="#ff738d" d="M25.536,41.425a81.63,81.63,0,0,1-2.642-10.441c.006.008,1.4.221,1.4.221,1.986.1,2.148-.324,3.823-1.542s2.139-1.245,2.649-3.16l.221-1.4A77.639,77.639,0,0,1,38.7,30.624c1.451,1.324,2.667,2.411,2.939,4.045a4.333,4.333,0,0,1-2.869,4.557c-2.8.95-6.147,2.237-7.06,3.893-.811,1.484-2.169,2.473-3.824,1.542A6.437,6.437,0,0,1,25.536,41.425Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M34.877,32.166a25.813,25.813,0,0,0-5.144-3.678"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M28.405,36.868s-2.016-4.3-1.909-6.029"/><circle cx="37.45" cy="34.005" r="1" fill="#ff3d63"/><circle cx="32.229" cy="35.326" r="1" fill="#ff3d63"/><circle cx="29.359" cy="39.883" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M27.406,44.306C29,45,29.609,43.7,30,43c.913-1.652,3.178-3.271,5.977-4.216,1.514-.52,4.39-1.578,4.023-3.784-.271-1.632-2.64-3.5-4.092-4.819a54.8,54.8,0,0,0-5.123-3.818l.2-1.257A79.011,79.011,0,0,1,38.7,30.624c1.452,1.318,2.668,2.413,2.939,4.045a4.337,4.337,0,0,1-2.869,4.557c-2.8.946-6.147,2.241-7.06,3.893C30.9,44.6,29.543,45.6,27.887,44.661A2.371,2.371,0,0,1,27.406,44.306Z"/><path fill="#ff738d" d="M41.047,27.924A81.758,81.758,0,0,1,30.3,27.21c.01,0,.642-1.26.642-1.26.711-1.857.356-2.143-.285-4.113s-.523-2.419-2.187-3.5L27.21,17.7a77.656,77.656,0,0,1,7.633-5.635c1.707-.971,3.117-1.792,4.755-1.545a4.334,4.334,0,0,1,3.447,4.137c.039,2.958.228,6.538,1.521,7.918,1.161,1.23,1.682,2.827.285,4.113A6.446,6.446,0,0,1,41.047,27.924Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M35.128,16.179a25.842,25.842,0,0,0-5.089,3.756"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M37.6,23.787s-4.717.587-6.325-.048"/><circle cx="37.672" cy="14.3" r="1" fill="#ff3d63"/><circle cx="37.315" cy="19.674" r="1" fill="#ff3d63"/><circle cx="40.762" cy="23.811" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M44.365,27.036A2.755,2.755,0,0,0,44,24a10.4,10.4,0,0,1-2.239-6.822c-.026-1.6-.55-4.845-2.761-5.178-1.636-.246-3.739,1.612-5.441,2.585a54.956,54.956,0,0,0-5.215,3.692L27.21,17.7a78.962,78.962,0,0,1,7.633-5.635c1.7-.973,3.119-1.791,4.755-1.545a4.338,4.338,0,0,1,3.447,4.137c.035,2.954.232,6.539,1.521,7.918,1.158,1.233,1.686,2.827.285,4.113A2.377,2.377,0,0,1,44.365,27.036Z"/><path fill="#ff738d" d="M33,9a81.81,81.81,0,0,1-4,10c0-.01-1-1-1-1-1.547-1.25-1.928-1-4-1s-2.462-.25-4,1l-1,1a77.619,77.619,0,0,1-3-9c-.4-1.924-.741-3.518,0-5a4.334,4.334,0,0,1,5-2c2.825.877,6.287,1.8,8,1,1.528-.724,3.208-.726,4,1A6.445,6.445,0,0,1,33,9Z"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20,11a25.824,25.824,0,0,0,2,6"/><path fill="none" stroke="#ff3d63" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M28,11s-.9,4.667-2,6"/><circle cx="19" cy="8" r="1" fill="#ff3d63"/><circle cx="24" cy="10" r="1" fill="#ff3d63"/><circle cx="29" cy="8" r="1" fill="#ff3d63"/><path fill="#ff3d63" d="M33.18,5.57C32,4,30.73,4.66,30,5a9.908,9.908,0,0,1-7,0c-1.53-.47-5-1-6,1-.74,1.48.6,4.08,1,6a41.763,41.763,0,0,0,1.27,4.3c-.59-.53-1.22-1.09-1.88-1.65A40.941,40.941,0,0,1,16,10c-.4-1.92-.74-3.52,0-5a4.338,4.338,0,0,1,5-2c2.82.88,6.29,1.8,8,1,1.53-.72,3.21-.73,4,1A2.38,2.38,0,0,1,33.18,5.57Z"/><path fill="#ffec96" d="M32,24.008a8,8,0,1,1-12.968-6.28c.016-.008.024-.024.04-.032.048-.032.088-.064.128-.1h.008a7.976,7.976,0,0,1,9.584,0s0-.008.008,0h.008a.4.4,0,0,1,.064.056,1.247,1.247,0,0,1,.16.128A7.984,7.984,0,0,1,32,24.008Z"/><path fill="#ffdb45" d="M24.13,32H24a8,8,0,0,1-4.97-14.27c.02-.01.03-.03.04-.03.05-.04.09-.07.13-.1h.01A7.886,7.886,0,0,1,24,16a7.805,7.805,0,0,1,3.87,1.01,7.8,7.8,0,0,0-4.66,1.59H23.2c-.04.03-.08.06-.13.1-.01,0-.02.02-.04.03A8,8,0,0,0,24.13,32Z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/fruit.svg b/app/assets/images/icons/plant_parts/fruit.svg
new file mode 100644
index 000000000..115ac4bcb
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/fruit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#689f38" d="M43.005,8.556c-0.318-0.619-0.605-1.149-0.908-1.641L43,3H7L6.672,3.656C6.501,3.766,6.354,3.875,6.258,3.97C5.337,4.87,4.911,5.563,4.33,6.689C3.943,7.44,3.708,8.302,3.495,9.112C3.367,9.601,3,11,3,11s0.75-0.782,1.539-1.089C4.852,9.789,5.184,9.457,5.404,9.22c0.409-0.442,0.869-1.102,1.275-1.842l0.29,1.013c-0.8,0.943-1.322,1.846-1.973,3.115c-0.581,1.131-0.934,2.43-1.253,3.65C3.55,15.893,3,18,3,18s1.126-1.178,2.309-1.641c0.469-0.184,0.968-0.683,1.298-1.041c0.57-0.618,1.206-1.522,1.782-2.541L11,18c0,0,2.75-5.75,3-6c0.116-0.116,1.203,0.307,2.333,0.794c0.573,1.012,1.206,1.91,1.772,2.524c0.33,0.358,0.829,0.857,1.298,1.041C20.586,16.822,21.712,18,21.712,18s-0.55-2.107-0.743-2.844c-0.118-0.452-0.246-0.915-0.384-1.376c0.233-0.142,0.476-0.274,0.723-0.371c0.469-0.184,0.968-0.683,1.298-1.041c0.38-0.412,0.789-0.958,1.19-1.571L25,12l1.819-1.819c0.519,0.871,1.072,1.642,1.574,2.187c0.237,0.257,0.562,0.584,0.9,0.818c-0.092,0.326-0.178,0.651-0.262,0.971C28.839,14.893,28.288,17,28.288,17s1.126-1.178,2.309-1.641c0.336-0.131,0.685-0.425,0.978-0.712C31.839,14.881,32,15.049,32,15.049s-0.072-0.277-0.173-0.661c0.021-0.023,0.047-0.048,0.067-0.07c0.081-0.088,0.166-0.195,0.249-0.293c0.083,0.099,0.168,0.206,0.249,0.293c0.33,0.358,0.829,0.857,1.298,1.041C34.874,15.822,36,17,36,17s-0.492-1.883-0.707-2.707L37,16h3l0.957-4.146c0.148,0.186,0.295,0.36,0.437,0.514c0.33,0.358,0.829,0.857,1.298,1.041C43.874,13.871,45,15.049,45,15.049s-0.55-2.107-0.743-2.844C43.939,10.987,43.585,9.687,43.005,8.556z"/><path fill="#6d4c41" d="M4.222,3c5.841,17.549,4.792,41.663,4.781,41.906l3.995,0.188C13.045,44.095,14.051,21.088,8.427,3H4.222z"/><path fill="#6d4c41" d="M15.321 3c-4.227 9.476-5.744 23.203-5.813 23.84l2.982.32C12.508 27.003 14.173 11.976 18.64 3H15.321zM23.25 3h-3.266c3.448 7.811 3.025 15.828 3.017 16v7h3l-.003-6.906C26.022 18.723 26.45 11.048 23.25 3z"/><path fill="#6d4c41" d="M30.739,3h-4.359c-4.846,12.505-4.325,40.78-4.298,42.041l3.999-0.082C26.075,44.643,25.495,13.429,30.739,3z"/><path fill="#6d4c41" d="M34.186,3h-3.534c6.34,8.99,6.844,28.815,6.848,29v3h3l0-3.031C40.481,31.103,40.029,13.257,34.186,3z"/><path fill="#6d4c41" d="M44.104,3h-4.149c-3.146,12.283-2.967,40.754-2.957,42.016l4-0.031C40.996,44.672,40.799,13.915,44.104,3z"/><path fill="#ffb300" d="M12.043,21.024c0.51-0.11,1.109,0.216,1.516,0.667c0.276,0.306,0.566,0.509,0.912,0.721c0.37,0.226,0.732,0.478,1.038,0.795c1.106,1.146,1.293,2.891,1.412,4.477c0.019,0.257,0.039,0.514,0.058,0.77c0.025,0.33,0.048,0.671-0.053,0.978c-0.101,0.307-0.36,0.574-0.676,0.567c-0.354-0.008-0.63-0.33-0.906-0.578c-0.607-0.544-1.377-0.785-2.029-1.248c-0.65-0.462-1.043-1.165-1.335-1.907C11.363,24.7,10.091,22.012,12.043,21.024C12.17,20.96,11.935,21.047,12.043,21.024z"/><path fill="#ffc107" d="M34.957 10.024c-.51-.11-1.109.216-1.516.667-.276.306-.566.509-.912.721-.37.226-.732.478-1.038.795-1.106 1.146-1.293 2.891-1.412 4.477-.019.257-.039.514-.058.77-.025.33-.048.671.053.978.101.307.36.574.676.567.354-.008.63-.33.906-.578.607-.544 1.377-.785 2.029-1.248.65-.462 1.043-1.165 1.335-1.907C35.637 13.7 36.909 11.012 34.957 10.024 34.83 9.96 35.065 10.047 34.957 10.024zM40.696 25.016c.34-.073.74.144 1.011.445.184.204.377.339.608.48.247.151.488.319.692.53.737.764.862 1.927.941 2.985.013.171.026.342.039.514.017.22.032.448-.035.652-.067.205-.24.383-.45.378-.236-.005-.42-.22-.604-.385-.405-.363-.918-.523-1.353-.832-.434-.308-.695-.777-.89-1.272C40.242 27.466 39.394 25.675 40.696 25.016 40.78 24.973 40.623 25.032 40.696 25.016zM8.639 17c-1.238.125-2.409 1.004-3.059 2.295-.65 1.291-.762 2.962-.293 4.364.154.459.324.908.523 1.344.253.555.605 1.03.81.995.316-.053.473-.48.686-.77.278-.378.68-.489 1.007-.792.367-.34.849-.947 1.02-1.434C9.835 21.577 10 21.159 10 19.626c0-1.013-.418-2.521-.659-2.57L8.639 17zM23.639 14c-1.238.125-2.409 1.004-3.059 2.295-.65 1.291-.762 2.962-.293 4.364.154.459.324.908.523 1.344.253.555.605 1.03.81.995.316-.053.473-.48.686-.77.278-.378.68-.489 1.007-.792.367-.34.849-.947 1.02-1.434C24.835 18.577 25 18.159 25 16.626c0-1.013-.418-2.521-.659-2.57L23.639 14z"/><path fill="#ffd740" d="M14.571,10c0,0,0.339,0.002,0.571,0c1.087-0.008,2.175,0.881,2.61,2.127c0.528,1.512,0.173,3.353-0.702,4.602c-0.121,0.172-0.312,0.348-0.473,0.235c-0.058-0.041-0.096-0.111-0.136-0.176c-0.322-0.513-0.869-0.718-1.299-1.094c-0.64-0.558-1.007-1.498-1.108-2.449c-0.054-0.505-0.039-1.016,0.018-1.519c0.039-0.347,0.05-0.705,0.141-1.042C14.237,10.518,14.408,10.064,14.571,10z"/><path fill="#ffc107" d="M25.571,25c0,0,0.339,0.002,0.571,0c1.087-0.008,2.175,0.881,2.61,2.127c0.528,1.512,0.173,3.353-0.702,4.602c-0.121,0.172-0.312,0.348-0.473,0.235c-0.058-0.041-0.096-0.111-0.136-0.176c-0.322-0.513-0.869-0.718-1.299-1.094c-0.64-0.558-1.007-1.498-1.108-2.449c-0.054-0.505-0.039-1.016,0.018-1.519c0.039-0.347,0.05-0.705,0.141-1.042C25.237,25.518,25.408,25.064,25.571,25z"/><path fill="#ffd740" d="M38.286,18c0,0-0.424,0.002-0.714,0c-1.359-0.011-2.719,1.133-3.262,2.735c-0.66,1.944-0.217,4.311,0.878,5.917c0.151,0.221,0.39,0.448,0.591,0.302c0.072-0.052,0.12-0.143,0.17-0.226c0.403-0.659,1.086-0.923,1.624-1.406c0.8-0.718,1.259-1.926,1.385-3.149c0.067-0.649,0.049-1.306-0.022-1.954c-0.049-0.447-0.063-0.906-0.177-1.34C38.703,18.667,38.489,18.083,38.286,18z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/leaves.svg b/app/assets/images/icons/plant_parts/leaves.svg
new file mode 100644
index 000000000..3f7da11bd
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/leaves.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#8BC34A" d="M14,35c0,0-2.3-14,13-14c10,0,17,8,17,8s-7.5,12-19,12C16,41,14,35,14,35z M18,18c0-6.1-6-12-6-12s-7.3,4.3-8,13s5.8,10.7,5.8,10.7S18,26.8,18,18z"/><path fill="#689F38" d="M44,29c0,0-7.5,12-19,12c-6,0-8.9-2.7-10.2-4.5c-2.9,2.5-3.9,4.8-3.9,4.9C10.8,41.8,10.4,42,10,42c-0.1,0-0.3,0-0.4-0.1c-0.5-0.2-0.7-0.8-0.5-1.3c0.1-0.3,2.6-5.8,10.2-9.4C30.3,25.4,44,29,44,29z M11,35c0.1,0,0.2,0,0.3-0.1c0.5-0.2,0.8-0.8,0.6-1.3c-0.5-1.5-0.9-2.9-1.1-4.4C13,28.2,18,24.9,18,18c0-6.1-6-12-6-12s-0.4,1.1-1,3c0,0,0,0,0,0c-0.2,0.5-5.2,13.6-0.9,25.3C10.2,34.7,10.6,35,11,35z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/pod.svg b/app/assets/images/icons/plant_parts/pod.svg
new file mode 100644
index 000000000..b06004f4c
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/pod.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 48 48"><path fill="#7CB342" d="M42.36,3.967c-1.839,0-7.27,0.669-11.36,8.033c-5,9-6,10-8,12S11,34,11,34s-5,4-6,8c0,0,1.943,2,5.972,2S23,44,34,33c8-9,8-19,8-19s0-2,0-6c0-3.162,1-4,1-4S42.769,3.967,42.36,3.967L42.36,3.967z"/><path fill="#388E3C" d="M32.748,12.971c-5.136,9.245-6.204,10.314-8.334,12.443c-2.055,2.055-11.753,9.818-12.165,10.147c-1.058,0.851-3.663,3.288-4.838,5.676C8.157,41.606,9.335,42,10.972,42c3.909,0,11.18,0,21.572-10.372c7.32-8.268,7.455-17.541,7.456-17.633V8c0-0.626,0.034-1.186,0.094-1.688C38.004,6.935,35.17,8.612,32.748,12.971z"/><path fill="#C5E1A5" d="M34.5 18A2.5 2.5 0 1 0 34.5 23 2.5 2.5 0 1 0 34.5 18zM37 11A2 2 0 1 0 37 15 2 2 0 1 0 37 11zM30 24A3 3 0 1 0 30 30 3 3 0 1 0 30 24zM24.5 30A2.5 2.5 0 1 0 24.5 35 2.5 2.5 0 1 0 24.5 30zM19 35A2 2 0 1 0 19 39 2 2 0 1 0 19 35zM13 37A2 2 0 1 0 13 41 2 2 0 1 0 13 37z"/><path fill="#8BC34A" d="M43,4c0,0-7-1-12,8s-6,10-8,12S11,34,11,34s-5,4-6,8c0,0,10-3,21-14c8-9,7-13,13-20C41.058,5.599,43,4,43,4z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/seeds.svg b/app/assets/images/icons/plant_parts/seeds.svg
new file mode 100644
index 000000000..c8652e798
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/seeds.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#689f38" d="M16.976 3c-1.671.09-5.807 3.942-7 6-2.907 5.013-3.943 8.571-5.154 14.24C4.015 27.02 3.976 31.141 3.976 35c0 2.333 0 9 0 9s2.315-4.303 5.32-6.513c1.193-.877 2.235-2.715 2.904-4.014 2.421-4.699 5.776-12.302 5.776-19.473C17.976 10.5 18.245 6.162 16.976 3M27 18.235c1.169-.213 4.686 1.64 5.862 2.795 2.866 2.814 4.191 4.978 5.998 8.497 1.205 2.347 1.938 5.043 2.599 7.572C41.858 38.629 43 43 43 43s-2.336-2.444-4.79-3.404c-.974-.381-2.008-1.416-2.693-2.159-2.477-2.687-5.576-7.944-6.805-12.646-.599-2.294-1.05-4.511-.715-6.79"/><path fill="#6d4c41" d="M13.326,3C19.833,21.5,16.003,44.753,16,45h13.999C30.012,43.968,33.333,22.333,28,3H13.326z"/><path fill="#ffc107" d="M17.917,10c-3.714,0.335-7.227,2.677-9.177,6.117s-2.286,7.895-0.88,11.633c0.461,1.225,0.973,2.42,1.569,3.583c0.758,1.479,1.815,2.745,2.431,2.653c0.949-0.141,1.418-1.28,2.058-2.052c0.833-1.007,2.04-1.304,3.02-2.111C18.041,28.916,19.484,27.3,20,26c1.506-3.798,2-4.912,2-9c0-2.701-1.255-6.721-1.977-6.851L17.917,10z"/><path fill="#ffb300" d="M22.975,7.838c1.044-0.956,2.801-1.028,4.26-0.548c0.991,0.326,1.892,0.396,2.933,0.408c1.114,0.013,2.237,0.096,3.309,0.407c3.874,1.123,6.333,4.895,8.45,8.394c0.343,0.566,0.686,1.133,1.028,1.699c0.441,0.729,0.892,1.484,1.017,2.331c0.125,0.848-0.161,1.821-0.894,2.239c-0.822,0.47-1.832,0.106-2.755-0.085c-2.027-0.421-4.076,0.084-6.115-0.087c-2.032-0.171-3.751-1.254-5.286-2.566C25.683,17.262,19.637,12.808,22.975,7.838C23.191,7.515,22.753,8.041,22.975,7.838z"/><path fill="#ffd740" d="M24,19c0,0,1.187,0.006,2,0c3.804-0.026,7.612,2.77,9.134,6.685c1.847,4.752,0.607,10.537-2.458,14.463c-0.422,0.54-1.093,1.095-1.655,0.739c-0.202-0.127-0.335-0.349-0.477-0.552c-1.127-1.612-3.04-2.256-4.547-3.437c-2.239-1.754-3.525-4.708-3.879-7.698c-0.188-1.586-0.137-3.193,0.061-4.775c0.137-1.092,0.176-2.215,0.495-3.275C22.831,20.629,23.43,19.202,24,19z"/><path fill="#ffa000" d="M20.023,10.149c0,0-0.433,0.169-1.123,0.553c-0.354,0.17-0.754,0.445-1.223,0.708c-0.446,0.315-0.964,0.629-1.472,1.05c-0.536,0.381-1.028,0.894-1.58,1.381c-0.257,0.264-0.493,0.562-0.749,0.849c-0.264,0.28-0.499,0.59-0.715,0.924c-0.214,0.333-0.483,0.636-0.662,1.002c-0.178,0.366-0.361,0.731-0.56,1.092c-0.226,0.348-0.3,0.772-0.456,1.158c-0.119,0.401-0.32,0.776-0.376,1.198l-0.259,1.24c-0.041,0.207-0.095,0.411-0.125,0.619l-0.034,0.633c-0.014,0.842-0.196,1.668-0.087,2.485c0.074,0.811,0.025,1.611,0.135,2.361c0.124,0.747,0.216,1.463,0.299,2.129c0.064,0.67,0.215,1.268,0.328,1.805c0.121,0.535,0.207,1.011,0.283,1.403c0.146,0.786,0.214,1.247,0.214,1.247s-0.224-0.397-0.588-1.114c-0.18-0.359-0.403-0.796-0.638-1.307c-0.241-0.509-0.534-1.08-0.711-1.752c-0.213-0.661-0.441-1.384-0.657-2.157c-0.216-0.773-0.294-1.629-0.421-2.504c-0.164-0.872-0.102-1.806-0.081-2.746l0.024-0.709c0.027-0.236,0.081-0.472,0.12-0.709l0.264-1.426c0.082-0.477,0.316-0.92,0.468-1.378c0.191-0.446,0.3-0.923,0.567-1.329c0.232-0.421,0.476-0.831,0.72-1.231c0.242-0.402,0.574-0.736,0.85-1.095c0.282-0.357,0.566-0.7,0.91-0.973c0.328-0.287,0.634-0.581,0.956-0.835c0.671-0.478,1.301-0.925,1.947-1.227c0.612-0.357,1.233-0.561,1.758-0.772c0.545-0.172,1.014-0.32,1.416-0.393c0.391-0.095,0.717-0.128,0.931-0.154C19.909,10.15,20.023,10.149,20.023,10.149z"/><path fill="#ffa000" d="M20.023,10.149c0,0-0.78,1.431-1.778,3.581c-0.488,1.083-1.054,2.336-1.591,3.705c-0.293,0.673-0.528,1.396-0.807,2.113c-0.295,0.711-0.506,1.466-0.765,2.203c-0.257,0.738-0.473,1.49-0.709,2.223c-0.193,0.745-0.419,1.471-0.62,2.179c-0.175,0.714-0.351,1.405-0.528,2.061c-0.184,0.654-0.291,1.287-0.442,1.864c-0.123,0.581-0.289,1.111-0.373,1.589c-0.092,0.477-0.193,0.893-0.272,1.237c-0.164,0.688-0.276,1.084-0.276,1.084s-0.056-0.402-0.121-1.11c-0.029-0.354-0.07-0.786-0.093-1.281c-0.044-0.497-0.02-1.053-0.004-1.663c0.027-0.608,0.006-1.278,0.109-1.969c0.082-0.694,0.145-1.434,0.279-2.187c0.157-0.747,0.277-1.533,0.478-2.312c0.224-0.772,0.424-1.566,0.675-2.345c0.293-0.764,0.538-1.546,0.868-2.282c0.301-0.747,0.652-1.459,1.006-2.139c0.328-0.692,0.732-1.319,1.091-1.921c0.368-0.598,0.748-1.144,1.114-1.635c0.721-0.99,1.422-1.74,1.924-2.246C19.699,10.398,20.023,10.149,20.023,10.149z"/><path fill="#ffa000" d="M20.023,10.149c0,0,0.062,0.406,0.138,1.114c0.062,0.712,0.191,1.712,0.181,2.939c0.003,0.612,0.025,1.279-0.016,1.981c-0.047,0.701-0.077,1.444-0.167,2.208c-0.13,0.763-0.182,1.563-0.388,2.36c-0.096,0.4-0.193,0.802-0.29,1.207l-0.38,1.206c-0.297,0.791-0.64,1.578-1.052,2.308c-0.385,0.746-0.884,1.404-1.341,2.025c-0.457,0.625-0.939,1.174-1.368,1.703c-0.424,0.535-0.837,1.022-1.191,1.496c-0.714,0.941-1.284,1.765-1.662,2.36c-0.384,0.592-0.624,0.931-0.624,0.931s0.082-0.398,0.262-1.094c0.084-0.351,0.209-0.769,0.392-1.236c0.16-0.478,0.377-1.003,0.653-1.559c0.523-1.124,1.307-2.358,2.089-3.599c0.395-0.621,0.748-1.271,1.087-1.932c0.348-0.658,0.626-1.361,0.876-2.078l0.375-1.08c0.101-0.371,0.201-0.741,0.3-1.108c0.2-0.733,0.356-1.481,0.531-2.194c0.133-0.726,0.281-1.429,0.423-2.096c0.125-0.672,0.244-1.308,0.354-1.894c0.242-1.172,0.404-2.184,0.564-2.875C19.917,10.546,20.023,10.149,20.023,10.149z"/><g><path fill="#ffb300" d="M24,19c0,0,0.166,1.498,0.416,3.744c0.14,1.108,0.305,2.389,0.553,3.73c0.252,1.338,0.584,2.742,1.08,4.04c0.244,0.65,0.541,1.266,0.879,1.826c0.351,0.566,0.708,1.014,1.216,1.563c0.929,1.034,1.83,2.071,2.429,3.124c0.305,0.524,0.514,1.058,0.627,1.545c0.13,0.485,0.114,0.931,0.089,1.276c-0.087,0.698-0.29,1.035-0.269,1.04c0,0-0.006-0.095-0.018-0.274c-0.001-0.176-0.053-0.434-0.114-0.741c-0.143-0.624-0.546-1.394-1.257-2.173c-0.721-0.779-1.699-1.594-2.75-2.558c-0.49-0.442-1.142-1.055-1.583-1.741c-0.468-0.679-0.825-1.424-1.117-2.176c-0.579-1.512-0.831-3.076-0.95-4.525c-0.073-0.724-0.067-1.427-0.061-2.088c0.002-0.661,0.05-1.285,0.107-1.857C23.495,20.463,24,19,24,19z"/><path fill="#ffb300" d="M24,19c0,0,0.196,0.327,0.507,0.909c0.146,0.296,0.346,0.646,0.578,1.025c0.233,0.384,0.47,0.813,0.773,1.278c0.578,0.934,1.291,1.994,2.051,3.148c0.762,1.156,1.591,2.387,2.329,3.72c0.367,0.662,0.72,1.348,1.022,2.047c0.15,0.352,0.292,0.705,0.425,1.055c0.111,0.363,0.22,0.722,0.327,1.076c0.117,0.347,0.181,0.713,0.238,1.066c0.051,0.356,0.135,0.692,0.133,1.04c0.013,0.341,0.026,0.673,0.038,0.994c0.003,0.319-0.064,0.631-0.092,0.924c-0.046,0.293-0.051,0.575-0.128,0.834c-0.078,0.256-0.153,0.499-0.223,0.728c-0.072,0.226-0.13,0.437-0.202,0.626c-0.093,0.182-0.178,0.349-0.255,0.5c-0.311,0.597-0.502,0.917-0.502,0.917s0.036-0.388,0.12-1.029c0.022-0.158,0.047-0.334,0.073-0.525c0.003-0.193,0.007-0.401,0.011-0.623c0.016-0.44,0.029-0.927-0.044-1.455c-0.021-0.527-0.154-1.083-0.274-1.665c-0.04-0.293-0.167-0.583-0.259-0.881c-0.108-0.296-0.167-0.607-0.311-0.908c-0.125-0.303-0.251-0.612-0.38-0.924c-0.158-0.305-0.31-0.616-0.457-0.932c-0.317-0.625-0.648-1.261-1.01-1.892c-0.702-1.267-1.453-2.553-2.096-3.802c-0.334-0.62-0.625-1.238-0.887-1.837c-0.281-0.585-0.492-1.171-0.682-1.71c-0.211-0.525-0.334-1.053-0.454-1.503c-0.135-0.449-0.198-0.843-0.241-1.17C24.037,19.379,24,19,24,19z"/><path fill="#ffb300" d="M24,19c0,0,0.104,0.017,0.3,0.049c0.194,0.034,0.488,0.074,0.848,0.172c0.722,0.185,1.754,0.529,2.886,1.189c0.558,0.337,1.161,0.727,1.726,1.23c0.584,0.482,1.15,1.058,1.663,1.713c0.517,0.651,1.003,1.367,1.403,2.146c0.385,0.83,0.717,1.486,1.015,2.396c0.155,0.43,0.267,0.861,0.359,1.29c0.109,0.427,0.2,0.857,0.25,1.293c0.073,0.431,0.12,0.863,0.118,1.294c0.02,0.429,0.025,0.852-0.01,1.268c-0.015,0.416-0.045,0.824-0.126,1.218c-0.055,0.396-0.144,0.776-0.241,1.143c-0.173,0.738-0.439,1.404-0.709,1.998c-0.541,1.192-1.187,2.065-1.665,2.634c-0.485,0.568-0.798,0.853-0.798,0.853s0.18-0.387,0.461-1.059c0.28-0.671,0.642-1.637,0.924-2.806c0.136-0.586,0.252-1.222,0.326-1.894c0.04-0.336,0.073-0.68,0.07-1.035c0.014-0.353,0.026-0.711,0.003-1.076c0.002-0.365-0.035-0.734-0.085-1.106c-0.031-0.373-0.105-0.746-0.172-1.123c-0.052-0.379-0.144-0.754-0.252-1.128c-0.092-0.38-0.2-0.752-0.339-1.102c-0.191-0.684-0.575-1.538-0.861-2.201c-0.35-0.679-0.68-1.359-1.095-1.961c-0.413-0.601-0.827-1.181-1.283-1.682c-0.447-0.509-0.913-0.956-1.354-1.367c-0.907-0.789-1.753-1.374-2.369-1.757C24.377,19.205,24,19,24,19z"/></g><g><path fill="#fb8c00" d="M23,8c0,0-0.178,0.405-0.148,1.113c0.012,0.703,0.302,1.665,0.989,2.604c0.678,0.945,1.715,1.876,2.944,2.725c0.607,0.436,1.271,0.846,1.958,1.242c0.698,0.381,1.396,0.792,2.13,1.146c0.372,0.189,0.714,0.354,1.1,0.527c0.372,0.183,0.748,0.378,1.103,0.534c0.713,0.332,1.44,0.639,2.132,0.923c0.695,0.29,1.378,0.497,2.034,0.702c0.657,0.199,1.311,0.327,1.936,0.509c0.628,0.173,1.204,0.381,1.684,0.612c0.481,0.229,0.877,0.46,1.189,0.671c0.321,0.193,0.544,0.391,0.706,0.507C42.915,21.935,43,22,43,22s-0.409-0.108-1.123-0.297c-0.712-0.189-1.701-0.394-2.906-0.466c-0.61-0.027-1.303-0.075-2.051-0.174c-0.749-0.089-1.53-0.28-2.31-0.516c-0.791-0.219-1.561-0.535-2.349-0.871c-0.782-0.328-1.525-0.681-2.289-1.1c-1.523-0.785-2.97-1.746-4.226-2.8c-1.231-1.081-2.265-2.284-2.83-3.525c-0.585-1.232-0.632-2.435-0.424-3.178c0.09-0.377,0.234-0.646,0.335-0.819C22.929,8.079,23,8,23,8z"/><path fill="#fb8c00" d="M22.908,8.395c0,0,0.315,0.231,0.843,0.657c0.251,0.234,0.616,0.417,0.975,0.686c0.351,0.268,0.835,0.498,1.294,0.8c0.492,0.269,1.023,0.555,1.592,0.848c0.579,0.28,1.19,0.576,1.821,0.882c1.276,0.601,2.658,1.224,4.032,1.921c1.37,0.698,2.729,1.456,3.937,2.289c0.62,0.388,1.175,0.837,1.704,1.253c0.54,0.399,0.99,0.863,1.423,1.255c0.433,0.395,0.777,0.818,1.098,1.168c0.329,0.341,0.561,0.693,0.765,0.966C42.791,21.675,43,22,43,22s-0.334-0.211-0.886-0.595c-0.276-0.192-0.599-0.433-0.994-0.678c-0.396-0.243-0.817-0.543-1.299-0.837c-0.495-0.279-0.996-0.617-1.561-0.928c-0.562-0.31-1.155-0.638-1.769-0.976c-0.607-0.347-1.272-0.647-1.921-0.998c-0.663-0.335-1.337-0.675-2.011-1.016c-1.35-0.685-2.713-1.401-3.958-2.157c-0.632-0.36-1.215-0.769-1.765-1.16c-0.554-0.384-1.046-0.805-1.49-1.193c-0.43-0.418-0.831-0.766-1.135-1.163c-0.308-0.378-0.595-0.691-0.757-0.986C23.097,8.736,22.908,8.395,22.908,8.395z"/><path fill="#fb8c00" d="M23,8c0,0,0.401,0.112,1.093,0.258c0.338,0.08,0.76,0.138,1.235,0.215c0.48,0.059,1.018,0.105,1.611,0.142c0.601,0.028,1.253,0.057,1.942,0.089c0.698,0.044,1.465,0.08,2.257,0.244c0.789,0.16,1.626,0.369,2.415,0.735c0.4,0.19,0.766,0.366,1.174,0.624l0.511,0.322l0.545,0.402c0.717,0.548,1.294,1.137,1.878,1.734c0.572,0.596,1.077,1.229,1.547,1.848c0.942,1.237,1.698,2.47,2.273,3.564c0.585,1.087,0.979,2.045,1.216,2.728C42.931,21.592,43,22,43,22s-0.23-0.344-0.659-0.905c-0.431-0.563-1.067-1.345-1.828-2.273c-0.772-0.92-1.675-1.981-2.669-3.074c-0.493-0.55-1.038-1.079-1.568-1.629c-0.537-0.53-1.131-1.059-1.694-1.499l-0.417-0.334l-0.502-0.337c-0.265-0.182-0.618-0.368-0.931-0.527c-0.64-0.335-1.311-0.586-1.991-0.78c-0.682-0.184-1.368-0.355-2.047-0.483c-0.677-0.129-1.33-0.274-1.935-0.434c-1.214-0.307-2.181-0.737-2.812-1.108c-0.326-0.164-0.54-0.348-0.704-0.45C23.085,8.058,23,8,23,8z"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/plant_parts/tuber.svg b/app/assets/images/icons/plant_parts/tuber.svg
new file mode 100644
index 000000000..2a96312c2
--- /dev/null
+++ b/app/assets/images/icons/plant_parts/tuber.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#EF6C00" d="M43,6c-0.1-1.1-1-1-1-1s-12.3-0.8-19.1,6c-3.7,3.8-5,7.8-6.2,11.4c-0.7,2.1-1.6,3.9-2.4,5.7C12.1,33,10.5,34.4,9,35c-0.7,0.3-3.4,0.2-4,1.4c-0.3,0.6,0.1,1.3,0.7,2c2.3,2.3,7.2,4.6,13,4.6c0.2,0,0.4,0,0.6,0c4.4-0.1,9.9-0.9,15.7-7c4.7-4.9,5.9-12.3,5.9-18c0-3.1-0.4-5.6-0.9-7C39.1,8.1,43,6.9,43,6z"/><path fill="#BF360C" d="M34,18c-0.4,0-0.7-0.2-0.9-0.5C31.8,15,29,15,29,15c0,0,0,0,0,0c-0.5,0-1-0.4-1-1c0-0.6,0.4-1,1-1c0.2,0,4-0.1,5.9,3.5c0.3,0.5,0.1,1.1-0.4,1.4C34.3,18,34.2,18,34,18z M35.5,25.9c0.5-0.3,0.7-0.9,0.4-1.3c-1.5-3-4.6-3.5-4.7-3.5c-0.6-0.1-1.1,0.3-1.1,0.8c-0.1,0.5,0.3,1.1,0.8,1.1c0,0,2.2,0.4,3.3,2.5c0.2,0.3,0.5,0.5,0.9,0.5C35.2,26,35.3,26,35.5,25.9z M25.4,26.9c0.5-0.2,0.8-0.8,0.5-1.3c-1-2.4-3.7-2.6-3.9-2.6c-0.5,0-1,0.4-1.1,0.9c0,0.5,0.4,1,0.9,1.1c0,0,1.7,0.2,2.2,1.4c0.2,0.4,0.5,0.6,0.9,0.6C25.1,27,25.3,27,25.4,26.9z M28.2,36c0.5-0.1,0.9-0.6,0.8-1.2c-0.4-1.7-1.9-2.6-2.7-2.8c-0.5-0.1-1.1,0.2-1.2,0.7c-0.1,0.5,0.2,1.1,0.7,1.2c0,0,1.1,0.3,1.3,1.2c0.1,0.5,0.5,0.8,1,0.8C28.1,36,28.1,36,28.2,36z M19.2,36c0.5-0.1,0.9-0.6,0.8-1.2c-0.4-1.8-1.9-2.6-2.8-2.8c-0.5-0.1-1.1,0.2-1.2,0.8c-0.1,0.5,0.2,1.1,0.8,1.2c0,0,1,0.2,1.2,1.2c0.1,0.5,0.5,0.8,1,0.8C19.1,36,19.1,36,19.2,36z"/><path fill="#D84315" d="M21,40c-7.8,0.4-9-5-9-5s-0.1-1.4,0.5-3.4c-1.3,2.1-2.4,2.9-3.5,3.4c-0.4,0.2-1.7,0.2-2.6,0.5c-0.6,0.2-1.1,0.5-1.3,0.9C5,36.6,4.9,36.7,5,36.9c0,0.5,0.3,1,0.8,1.5c2.3,2.3,7.2,4.6,13,4.6c0.2,0,0.4,0,0.6,0c1.6,0,3.4-0.2,5.3-0.6c1.6-0.4,3.3-1,5-2c0.7-0.4,1.4-0.9,2.1-1.4s1.4-1.1,2.2-1.8c0.4-0.3,0.7-0.7,1.1-1.1c1.8-1.8,3-4,3.9-6.4c0.3-0.8,0.6-1.6,0.8-2.4s0.4-1.6,0.6-2.4c0.2-0.8,0.3-1.6,0.4-2.4c0.1-1.2,0.2-2.3,0.2-3.4c0-0.4,0-0.7,0-1.1C41.2,30.9,28.8,39.6,21,40z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/planting-add.svg b/app/assets/images/icons/planting-add.svg
new file mode 100644
index 000000000..dd025e3c6
--- /dev/null
+++ b/app/assets/images/icons/planting-add.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1">
+<g id="surface1025178">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,76.470588%,29.019608%);fill-opacity:1;" d="M 24 25 C 23.398438 25 23 24.5 23 24 C 23 23.898438 23.101562 18.398438 19.699219 16.300781 C 19.199219 16 19.101562 15.398438 19.398438 14.898438 C 19.699219 14.398438 20.300781 14.300781 20.800781 14.601562 C 25.199219 17.398438 25.101562 23.800781 25.101562 24.101562 C 25 24.601562 24.5 25 24 25 Z M 24 25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,76.470588%,29.019608%);fill-opacity:1;" d="M 20.199219 7 C 15.398438 4.601562 7.898438 7.300781 6 8 C 8.800781 9.699219 8.398438 18.898438 13.5 20.601562 C 17.101562 21.800781 19.898438 20.398438 20.199219 15.398438 C 24.199219 13.101562 23.601562 8.699219 20.199219 7 Z M 24 28 C 23.398438 28 23 27.601562 23 27 L 23 24 C 23 16.199219 28.800781 15 28.800781 15 C 29.300781 14.898438 29.898438 15.300781 30 15.800781 C 30.101562 16.300781 29.699219 16.898438 29.199219 17 C 29 17 25 17.898438 25 24 L 25 27 C 25 27.601562 24.601562 28 24 28 Z M 24 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,76.470588%,29.019608%);fill-opacity:1;" d="M 30.199219 8.300781 C 34.601562 6.898438 40.601562 11 42 12 C 39.398438 13 37.699219 21.300781 33.101562 21.898438 C 29.898438 22.300781 28.199219 20.601562 29 16 C 25.398438 13.199219 27.101562 9.199219 30.199219 8.300781 Z M 30.199219 8.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,62.352941%,21.960784%);fill-opacity:1;" d="M 13.5 20.601562 C 8.398438 18.898438 8.800781 9.699219 6 8 C 8.5 8.199219 12.101562 10.398438 20.199219 15.398438 C 19.898438 20.398438 17.199219 21.800781 13.5 20.601562 Z M 33.199219 21.898438 C 37.699219 21.300781 39.398438 13 42.101562 12 C 40 11.699219 36.699219 12.898438 29.101562 16 C 27.398438 20.5 29.898438 22.398438 33.199219 21.898438 Z M 33.199219 21.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(90.196078%,29.019608%,9.803922%);fill-opacity:1;" d="M 13 27 L 16 42 L 32 42 L 35 27 Z M 13 27 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(74.901961%,21.176471%,4.705882%);fill-opacity:1;" d="M 35 30 L 13 30 C 12.398438 30 12 29.5 12 29 L 12 25 L 36 25 L 36 29 C 36 29.5 35.5 30 35 30 Z M 35 30 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(26.27451%,62.745098%,27.843137%);fill-opacity:1;" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36 "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/planting-hand.svg b/app/assets/images/icons/planting-hand.svg
new file mode 100644
index 000000000..03731c9a6
--- /dev/null
+++ b/app/assets/images/icons/planting-hand.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#e39d36" d="M32.4,29.1l-13.2,7.8c0,0,3.1,4,3.1,4l12.6-7.6c1.2-0.7,1.5-2.2,0.8-3.3 C35.1,28.8,33.6,28.4,32.4,29.1"/><path fill="#689f38" d="M32.7,13.2C31.1,8.5,23.8,5.7,22,5c0.8,2.9-4.8,8.8-2.5,13.2c1.6,3.1,4.6,4,8,0.8 C31.3,19.9,33.9,16.5,32.7,13.2z"/><path fill="#8bc34a" d="M27,26C27,26,27,26,27,26c-0.6,0-1-0.5-1-1.1c0-0.1,0.5-7.9-2.9-11.7c-0.4-0.4-0.3-1,0.1-1.4 c0.4-0.4,1-0.3,1.4,0.1c3.9,4.5,3.4,12.8,3.4,13.2C28,25.6,27.5,26,27,26z"/><path fill="#8bc34a" d="M19.6,18.2C17.3,13.8,22.8,7.9,22,5c1.5,1.7,3.5,5.5,5.5,14c0,0,0,0,0,0 C24.1,22.2,21.2,21.3,19.6,18.2z"/><path fill="#795548" d="M27 27c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S27 25.3 27 27zM33 32c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S33 30.3 33 32z"/><path fill="#795548" d="M30 29c0-1.7-1.6-3-3.5-3S23 27.3 23 29s1.6 3 3.5 3S30 30.7 30 29zM23 28c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S23 26.3 23 28z"/><path fill="#795548" d="M31 26.5c0 1.4-1.1 2.5-2.5 2.5S26 27.9 26 26.5s1.1-2.5 2.5-2.5S31 25.1 31 26.5zM36 30c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2S36 28.9 36 30z"/><path fill="#795548" d="M34,27.5c0,1.4-1.1,2.5-2.5,2.5S29,28.9,29,27.5s1.1-2.5,2.5-2.5S34,26.1,34,27.5z"/><path fill="#ffb74d" d="M38.9,30.4l-12.4,7.3c0,0,0,0,0,0l-5.9-3.4l2.9,1.6c1.3,0.7,2.9,0.5,3.9-0.6 c1.3-1.5,0.9-3.8-0.8-4.7l-12.4-6.8c-1.1-0.6-2.5-0.6-3.7,0L5,27.1c0,0,0,0,0,0.1v10.7l4-2.6l15.1,8.2c1.2,0.6,2.6,0.6,3.8-0.1 l13.8-8.3c1.3-0.8,1.7-2.4,0.9-3.7C41.9,30.1,40.2,29.7,38.9,30.4"/><path fill="#eda740" d="M27.5,35.4c-0.7,0.9-1.9,1.2-3,1l-0.2,0.1l2.2,1.3l12.4-7.3c0.1-0.1,0.2-0.1,0.3-0.1 c-0.7-1.1-2.1-1.4-3.2-0.7l-7.8,4.6C28,34.6,27.8,35,27.5,35.4z"/><path fill="#eda740" d="M26.5,37.8L26.5,37.8l-1.3-0.9l-10.7-6l8,6.6C23.7,38.4,25.2,38.5,26.5,37.8"/><path fill="#ffcc80" d="M24.4,35.2c-0.9-0.5-0.6-1.3-0.1-2.2c0.5-0.9,0.9-1.6,1.8-1.1s1.3,1.6,0.8,2.5 C26.5,35.3,25.4,35.6,24.4,35.2"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/planting-sun.svg b/app/assets/images/icons/planting-sun.svg
new file mode 100644
index 000000000..4b69d1d59
--- /dev/null
+++ b/app/assets/images/icons/planting-sun.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144" height="144"><path fill="#8bc34a" d="M23,43c-0.6,0-1-0.4-1-1c0-0.2-0.1-5.4-5.4-8.1c-0.5-0.2-0.7-0.8-0.4-1.3c0.2-0.5,0.8-0.7,1.3-0.4 c6.5,3.2,6.6,9.6,6.6,9.9C24,42.6,23.6,43,23,43z"/><path fill="#8bc34a" d="M19.6 26.8C15.5 24.6 8.6 27.4 7 28c2.4 1.5 2.5 9.2 6.9 10.7 3.1 1.1 5.7-.3 5.9-4.6C23 32.3 22.5 28.3 19.6 26.8zM23 43c-.6 0-1-.4-1-1 0-6.7 4.6-7.9 4.8-8 .5-.1 1.1.2 1.2.7.1.5-.2 1.1-.7 1.2-.1 0-3.3 1-3.3 6C24 42.6 23.6 43 23 43z"/><path fill="#8bc34a" d="M27.8,28.2c3.8-1.1,9,2,10.2,2.8c-2.3,0.8-3.7,7.5-7.7,8c-2.8,0.3-4.7-1.2-4.1-4.8 C23.9,32.1,25.1,29,27.8,28.2z"/><path fill="#689f38" d="M13.9 38.7C9.5 37.2 9.4 29.5 7 28c0 0 0 0 0 0 2.1.2 5.9 1.6 12.8 6 0 0 0 0 0 0C19.6 38.4 17 39.7 13.9 38.7zM30.3 39c3.9-.5 5.4-7.1 7.7-8 0 0 0 0 0 0-1.8-.2-5.2.7-11.8 3.1 0 0 0 0 0 0C25.6 37.8 27.5 39.3 30.3 39z"/><path fill="#ff9800" d="M25,8h13v13H25V8z"/><path fill="#ff9800" d="M31.5,24L22,14.5L31.5,5l9.5,9.5L31.5,24z"/><path fill="#ffeb3b" d="M27,14.5c0,2.5,2,4.5,4.5,4.5s4.5-2,4.5-4.5c0-2.5-2-4.5-4.5-4.5S27,12,27,14.5"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/planting.svg b/app/assets/images/icons/planting.svg
index 48d867aa0..bb37c3756 100644
--- a/app/assets/images/icons/planting.svg
+++ b/app/assets/images/icons/planting.svg
@@ -1,5 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" " d="M 23.398438 14.023438 C 23.058594 14.042969 22.835938 13.933594 22.808594 13.914063 L 21.121094 14.992188 C 21.492188 15.574219 22.257813 15.96875 23.117188 16.019531 C 23.183594 16.023438 23.25 16.023438 23.316406 16.023438 C 24.445313 16.023438 25.554688 15.453125 26.394531 14.4375 C 27.828125 12.695313 28.835938 10.847656 28.878906 10.769531 L 29.332031 9.929688 L 28.515625 9.4375 C 23.984375 6.714844 21.394531 8.007813 20.492188 8.691406 C 19.328125 9.574219 18.796875 11.019531 19.089844 12.429688 C 18.160156 13.023438 17.234375 13.773438 16.496094 14.6875 C 16.070313 13.691406 15.40625 12.796875 14.632813 12.007813 C 14.703125 11.824219 14.75 11.644531 14.78125 11.511719 C 14.796875 11.441406 14.8125 11.375 14.832031 11.316406 C 15.34375 9.601563 14.640625 7.601563 13.082031 6.34375 C 11.972656 5.449219 8.820313 3.683594 3.519531 6.605469 L 2.835938 6.980469 L 3.03125 7.730469 C 3.070313 7.882813 4.015625 11.445313 5.894531 13.53125 C 6.707031 14.433594 7.726563 14.941406 8.847656 14.996094 C 8.917969 15 8.988281 15 9.054688 15 C 10.3125 15 11.390625 14.441406 11.828125 14.042969 L 10.484375 12.5625 C 10.46875 12.574219 8.789063 13.753906 7.382813 12.191406 C 6.292969 10.984375 5.550781 9.046875 5.199219 7.984375 C 8.984375 6.160156 11.078125 7.296875 11.824219 7.898438 C 12.699219 8.605469 13.132813 9.648438 12.953125 10.554688 C 10.800781 8.960938 8.558594 8.070313 8.378906 8.003906 L 7.65625 9.867188 C 9.699219 10.65625 15 13.484375 15 17 L 15 20.144531 C 14.238281 20.34375 13.542969 20.753906 13.019531 21.34375 C 12.550781 21.117188 12.035156 21 11.5 21 C 10.070313 21 8.839844 21.859375 8.296875 23.09375 C 8.035156 23.03125 7.769531 23 7.5 23 C 5.570313 23 4 24.570313 4 26.5 L 4 27 L 6 27 L 6 26.5 C 6 25.671875 6.671875 25 7.5 25 C 7.902344 25 8.210938 25.167969 8.398438 25.308594 L 10 24.511719 L 10 24.496094 C 10.003906 23.671875 10.675781 23 11.5 23 C 11.902344 23 12.28125 23.160156 12.566406 23.449219 L 14.1875 23.167969 C 14.515625 22.457031 15.226563 22 16 22 C 16.726563 22 17.398438 22.40625 17.75 23.0625 L 19.328125 23.304688 C 19.527344 23.109375 19.792969 23 20.070313 23 C 20.65625 23 21.136719 23.480469 21.136719 24.066406 C 21.136719 24.183594 21.113281 24.300781 21.066406 24.429688 L 22.671875 25.519531 C 22.9375 25.28125 23.382813 25 24 25 C 25.101563 25 26 25.898438 26 27 L 28 27 C 28 24.792969 26.207031 23 24 23 C 23.65625 23 23.316406 23.046875 22.992188 23.132813 C 22.59375 21.894531 21.433594 21 20.070313 21 C 19.652344 21 19.253906 21.082031 18.878906 21.238281 C 18.367188 20.703125 17.714844 20.332031 17 20.144531 L 17 19 L 17.003906 19 L 17.003906 18.671875 C 17.003906 14.519531 23.535156 12.53125 23.601563 12.511719 L 23.039063 10.59375 C 22.9375 10.621094 22.121094 10.871094 21.046875 11.363281 C 21.125 10.949219 21.339844 10.5625 21.703125 10.289063 C 22.761719 9.484375 24.558594 9.636719 26.617188 10.675781 C 26.214844 11.332031 25.589844 12.273438 24.851563 13.167969 C 24.300781 13.835938 23.757813 14.003906 23.398438 14.023438 Z M 13.484375 10.820313 L 13.496094 10.976563 C 13.445313 10.9375 13.390625 10.898438 13.339844 10.855469 C 13.386719 10.84375 13.429688 10.824219 13.484375 10.820313 Z "/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144" height="144"><path fill="#8bc34a" d="M24,25C24,25,24,25,24,25c-0.6,0-1-0.5-1-1c0-0.1,0.1-5.6-3.3-7.7c-0.5-0.3-0.6-0.9-0.3-1.4 c0.3-0.5,0.9-0.6,1.4-0.3c4.4,2.8,4.3,9.2,4.3,9.5C25,24.6,24.5,25,24,25z"/><path fill="#8bc34a" d="M20.2 7C15.4 4.6 7.9 7.3 6 8c2.8 1.7 2.4 10.9 7.5 12.6 3.6 1.2 6.4-.2 6.7-5.2C24.2 13.1 23.6 8.7 20.2 7zM24 28c-.6 0-1-.4-1-1v-3c0-7.8 5.8-9 5.8-9 .5-.1 1.1.3 1.2.8.1.5-.3 1.1-.8 1.2C29 17 25 17.9 25 24v3C25 27.6 24.6 28 24 28z"/><path fill="#8bc34a" d="M30.2,8.3C34.6,6.9,40.6,11,42,12c-2.6,1-4.3,9.3-8.9,9.9c-3.2,0.4-4.9-1.3-4.1-5.9 C25.4,13.2,27.1,9.2,30.2,8.3z"/><path fill="#689f38" d="M13.5 20.6C8.4 18.9 8.8 9.7 6 8c2.5.2 6.1 2.4 14.2 7.4C19.9 20.4 17.2 21.8 13.5 20.6zM33.2 21.9c4.5-.6 6.2-8.9 8.9-9.9-2.1-.3-5.4.9-13 4C27.4 20.5 29.9 22.4 33.2 21.9z"/><path fill="#e64a19" d="M13,27l3,15h16l3-15H13z"/><path fill="#bf360c" d="M35,30H13c-0.6,0-1-0.5-1-1v-4h24v4C36,29.5,35.5,30,35,30z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/post.svg b/app/assets/images/icons/post.svg
index 2e8615513..7198c4607 100644
--- a/app/assets/images/icons/post.svg
+++ b/app/assets/images/icons/post.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="96px" height="96px">
-<g id="surface1">
-<path style=" " d="M 2 5 L 2 21 L 6 21 L 6 26.09375 L 7.625 24.78125 L 12.34375 21 L 22 21 L 22 5 Z M 4 7 L 20 7 L 20 19 L 11.65625 19 L 11.375 19.21875 L 8 21.90625 L 8 19 L 4 19 Z M 24 9 L 24 11 L 28 11 L 28 23 L 24 23 L 24 25.90625 L 20.34375 23 L 12.84375 23 L 10.34375 25 L 19.65625 25 L 26 30.09375 L 26 25 L 30 25 L 30 9 Z "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#1565C0" d="M20,36h16l6,6V20c0-2.209-1.791-4-4-4H20c-2.209,0-4,1.791-4,4v12C16,34.209,17.791,36,20,36"/><path fill="#2196F3" d="M29,26H12l-6,6V10c0-2.209,1.791-4,4-4h19c2.209,0,4,1.791,4,4v12C33,24.209,31.209,26,29,26"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/rabbit.svg b/app/assets/images/icons/rabbit.svg
new file mode 100644
index 000000000..ed73bb996
--- /dev/null
+++ b/app/assets/images/icons/rabbit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#546E7A" d="M13,32.827c-1.344-0.115-2.891-0.246-3-0.246c-0.87,0-1.694-0.174-2.44-0.479c-0.641-0.262-1.222-0.624-1.721-1.064c-0.323,0.695-0.434,1.492-0.238,2.293c1.009,4.12,4.382,5.409,7.399,5.628V32.827z"/><path fill="#CFD8DC" d="M35,31.002C31.78,36.152,26.075,41,20,41S9,36.075,9,30s4.925-11,11-11c0.7,0,4.159,0.002,6,0.002c0.918,0,2-1,2-2.002C42.667,16.752,39,24.002,35,31.002z"/><path fill="#78909C" d="M31,13c-5.524-2.763-15.654-2.004-15.749-2.014c-1.374-0.137-2.376-1.361-2.239-2.736c0.138-1.373,1.365-2.373,2.736-2.238c0.427,0.042,10.511-0.389,16.869,4.251c2.383,1.739,1.736,2.119,1.118,3.354C33.297,14.493,31.359,13.18,31,13z"/><path fill="#78909C" d="M44,20c0,3.313-6.687,3-10,3s-6-2.687-6-6s2.687-6,6-6S44,14,44,20z"/><path fill="#B0BEC5" d="M30.553,12.094C23.485,8.744,13.875,9.95,13.449,9.96c-1.377,0.029-2.477,1.17-2.449,2.55c0.028,1.381,1.17,2.478,2.551,2.449c0.09-0.002,8.996-1.756,14.882-0.191C28.869,13.684,29.61,12.757,30.553,12.094z"/><path fill="#90A4AE" d="M37 39V27.286c-.589 1.218-1.288 2.471-2 3.716-.827 1.323-1.82 2.625-2.94 3.831L33 40.005c0 0 0 1.995 2 1.995 1.115 0 4 0 4 0v-1C39 41 39 39 37 39zM25 32.5C25 41 15 39 12 39c0 0 0-1 0-6.5 0-3.59 2.91-6.5 6.5-6.5S25 28.91 25 32.5z"/><path fill="#90A4AE" d="M27,39H14h-2v3h17v-1C29,39.896,28.104,39,27,39z"/><path fill="#455A64" d="M40,17c0,0-1.594,0-2.422,0c-2,0-2.578-3-2.578-3s1.625,0,2.453,0C39.453,14,40,17,40,17z"/><path d="M37.5 14A1.5 1.5 0 1 0 37.5 17A1.5 1.5 0 1 0 37.5 14Z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/seed-add.svg b/app/assets/images/icons/seed-add.svg
new file mode 100644
index 000000000..9040d3628
--- /dev/null
+++ b/app/assets/images/icons/seed-add.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1">
+<g id="surface1048733">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(87.843137%,67.45098%,43.137255%);fill-opacity:1;" d="M 36 20 L 16 6 L 4 23 L 25 37 L 31 37 L 38.070312 25.394531 Z M 36 20 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(36.470588%,25.098039%,21.568627%);fill-opacity:1;" d="M 36.484375 35.726562 C 37.742188 36.925781 39.226562 37.355469 39.78125 36.679688 C 40.34375 36 39.773438 34.476562 38.515625 33.273438 C 37.253906 32.074219 35.777344 31.644531 35.214844 32.320312 C 34.652344 32.996094 35.226562 34.523438 36.484375 35.726562 Z M 30.359375 38.433594 C 31.976562 39.203125 33.578125 39.183594 33.929688 38.390625 C 34.285156 37.597656 33.257812 36.328125 31.640625 35.5625 C 30.023438 34.796875 28.421875 34.8125 28.070312 35.605469 C 27.714844 36.398438 28.742188 37.664062 30.359375 38.433594 Z M 29.484375 31.726562 C 30.742188 32.925781 32.226562 33.355469 32.78125 32.679688 C 33.34375 32 32.773438 30.476562 31.515625 29.273438 C 30.253906 28.074219 28.777344 27.644531 28.214844 28.320312 C 27.652344 28.996094 28.226562 30.523438 29.484375 31.726562 Z M 40 40 C 38.34375 40 37 40.671875 37 41.5 C 37 42.328125 38.34375 43 40 43 C 41.65625 43 43 42.328125 43 41.5 C 43 40.671875 41.65625 40 40 40 Z M 40 40 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,80%,50.196078%);fill-opacity:1;" d="M 16 6 L 18.214844 11.652344 L 10 23 L 4 23 L 25 37 L 36 20 Z M 16 6 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(33.333333%,54.509804%,18.431373%);fill-opacity:1;" d="M 28 23 C 28 26.316406 25.316406 29 22 29 C 18.683594 29 16 26.316406 16 23 C 16 19.683594 18.683594 17 22 17 C 25.316406 17 28 19.683594 28 23 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.535156 19.941406 C 20.535156 19.113281 21.191406 18.445312 22 18.445312 C 22.808594 18.445312 23.464844 19.113281 23.464844 19.941406 C 23.464844 20.773438 22 22.945312 22 22.945312 C 22 22.945312 20.535156 20.773438 20.535156 19.941406 M 23.464844 25.945312 C 23.464844 26.777344 22.808594 27.445312 22 27.445312 C 21.191406 27.445312 20.535156 26.777344 20.535156 25.945312 C 20.535156 25.113281 22 22.945312 22 22.945312 C 22 22.945312 23.464844 25.113281 23.464844 25.945312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.730469 22.742188 C 18.03125 22.328125 17.792969 21.414062 18.195312 20.695312 C 18.597656 19.976562 19.496094 19.730469 20.195312 20.148438 C 20.894531 20.5625 22 22.945312 22 22.945312 C 22 22.945312 19.433594 23.15625 18.730469 22.742188 M 25.269531 23.144531 C 25.96875 23.5625 26.207031 24.476562 25.804688 25.195312 C 25.402344 25.914062 24.503906 26.160156 23.804688 25.742188 C 23.101562 25.328125 22 22.945312 22 22.945312 C 22 22.945312 24.566406 22.730469 25.269531 23.144531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.269531 22.742188 C 25.96875 22.328125 26.207031 21.414062 25.804688 20.695312 C 25.402344 19.976562 24.503906 19.730469 23.804688 20.148438 C 23.101562 20.5625 22 22.945312 22 22.945312 C 22 22.945312 24.566406 23.15625 25.269531 22.742188 M 18.730469 23.144531 C 18.03125 23.5625 17.792969 24.476562 18.195312 25.195312 C 18.597656 25.914062 19.496094 26.160156 20.195312 25.742188 C 20.894531 25.328125 22 22.945312 22 22.945312 C 22 22.945312 19.433594 22.730469 18.730469 23.144531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,75.686275%,2.745098%);fill-opacity:1;" d="M 23.5 23 C 23.5 23.828125 22.828125 24.5 22 24.5 C 21.171875 24.5 20.5 23.828125 20.5 23 C 20.5 22.171875 21.171875 21.5 22 21.5 C 22.828125 21.5 23.5 22.171875 23.5 23 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(26.27451%,62.745098%,27.843137%);fill-opacity:1;" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36 "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/seeds-colour.svg b/app/assets/images/icons/seeds-colour.svg
deleted file mode 100644
index b2bc3e95b..000000000
--- a/app/assets/images/icons/seeds-colour.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="100" height="100" fill="000000">
-<g id="surface1">
-<path style=" fill:#E0AC6E;" d="M 36 20 L 16 6 L 4 23 L 25 37 L 31 37 L 38.070313 25.394531 Z "/>
-<path style=" fill:#5D4037;" d="M 36.484375 35.726563 C 37.742188 36.925781 39.226563 37.355469 39.78125 36.679688 C 40.34375 36 39.773438 34.476563 38.515625 33.273438 C 37.253906 32.074219 35.777344 31.644531 35.214844 32.320313 C 34.652344 32.996094 35.226563 34.523438 36.484375 35.726563 Z "/>
-<path style=" fill:#5D4037;" d="M 30.359375 38.433594 C 31.976563 39.203125 33.578125 39.183594 33.929688 38.390625 C 34.285156 37.597656 33.257813 36.328125 31.640625 35.5625 C 30.023438 34.796875 28.421875 34.8125 28.070313 35.605469 C 27.714844 36.398438 28.742188 37.664063 30.359375 38.433594 Z "/>
-<path style=" fill:#5D4037;" d="M 29.484375 31.726563 C 30.742188 32.925781 32.226563 33.355469 32.78125 32.679688 C 33.34375 32 32.773438 30.476563 31.515625 29.273438 C 30.253906 28.074219 28.777344 27.644531 28.214844 28.320313 C 27.652344 28.996094 28.226563 30.523438 29.484375 31.726563 Z "/>
-<path style=" fill:#5D4037;" d="M 43 41.5 C 43 40.671875 41.65625 40 40 40 C 38.34375 40 37 40.671875 37 41.5 C 37 42.328125 38.34375 43 40 43 C 41.65625 43 43 42.328125 43 41.5 Z "/>
-<path style=" fill:#FFCC80;" d="M 16 6 L 18.214844 11.652344 L 10 23 L 4 23 L 25 37 L 36 20 Z "/>
-<path style=" fill:#558B2F;" d="M 28 23 C 28 26.316406 25.316406 29 22 29 C 18.683594 29 16 26.316406 16 23 C 16 19.683594 18.683594 17 22 17 C 25.316406 17 28 19.683594 28 23 "/>
-<path style=" fill:#FFFFFF;" d="M 20.535156 19.941406 C 20.535156 19.113281 21.191406 18.445313 22 18.445313 C 22.808594 18.445313 23.464844 19.113281 23.464844 19.941406 C 23.464844 20.773438 22 22.945313 22 22.945313 C 22 22.945313 20.535156 20.773438 20.535156 19.941406 "/>
-<path style=" fill:#FFFFFF;" d="M 23.464844 25.945313 C 23.464844 26.777344 22.808594 27.445313 22 27.445313 C 21.191406 27.445313 20.535156 26.777344 20.535156 25.945313 C 20.535156 25.113281 22 22.945313 22 22.945313 C 22 22.945313 23.464844 25.113281 23.464844 25.945313 "/>
-<path style=" fill:#FFFFFF;" d="M 18.730469 22.742188 C 18.03125 22.328125 17.792969 21.414063 18.195313 20.695313 C 18.597656 19.976563 19.496094 19.730469 20.195313 20.148438 C 20.894531 20.5625 22 22.945313 22 22.945313 C 22 22.945313 19.433594 23.15625 18.730469 22.742188 "/>
-<path style=" fill:#FFFFFF;" d="M 25.269531 23.144531 C 25.96875 23.5625 26.207031 24.476563 25.804688 25.195313 C 25.402344 25.914063 24.503906 26.160156 23.804688 25.742188 C 23.101563 25.328125 22 22.945313 22 22.945313 C 22 22.945313 24.566406 22.730469 25.269531 23.144531 "/>
-<path style=" fill:#FFFFFF;" d="M 25.269531 22.742188 C 25.96875 22.328125 26.207031 21.414063 25.804688 20.695313 C 25.402344 19.976563 24.503906 19.730469 23.804688 20.148438 C 23.101563 20.5625 22 22.945313 22 22.945313 C 22 22.945313 24.566406 23.15625 25.269531 22.742188 "/>
-<path style=" fill:#FFFFFF;" d="M 18.730469 23.144531 C 18.03125 23.5625 17.792969 24.476563 18.195313 25.195313 C 18.597656 25.914063 19.496094 26.160156 20.195313 25.742188 C 20.894531 25.328125 22 22.945313 22 22.945313 C 22 22.945313 19.433594 22.730469 18.730469 23.144531 "/>
-<path style=" fill:#FFC107;" d="M 23.5 23 C 23.5 23.828125 22.828125 24.5 22 24.5 C 21.171875 24.5 20.5 23.828125 20.5 23 C 20.5 22.171875 21.171875 21.5 22 21.5 C 22.828125 21.5 23.5 22.171875 23.5 23 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/seeds.svg b/app/assets/images/icons/seeds.svg
index e546336af..b2bc3e95b 100644
--- a/app/assets/images/icons/seeds.svg
+++ b/app/assets/images/icons/seeds.svg
@@ -1,5 +1,18 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" version="1.1" width="100" height="100" fill="000000">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="100" height="100" fill="000000">
 <g id="surface1">
-<path style=" " d="M 10.84375 2 L 10.28125 2.8125 L 2.53125 14.46875 L 1.96875 15.3125 L 2.8125 15.84375 L 8.84375 19.875 L 13.5 22.9375 L 15.03125 22.25 C 15.148438 21.535156 15.746094 21 16.5 21 C 16.777344 21 17.265625 21.195313 17.5 21.375 L 19.09375 20.5625 C 19.09375 19.667969 19.691406 19 20.5 19 C 20.832031 19 21.117188 19.121094 21.375 19.3125 L 22.8125 19.0625 L 24.46875 16.59375 L 26.5 13.5625 L 27.03125 12.71875 L 26.21875 12.15625 L 11.6875 2.53125 Z M 11.40625 4.78125 L 24.25 13.28125 L 22.8125 15.46875 L 21.5625 17.34375 C 21.207031 17.21875 20.898438 17 20.5 17 C 19 17 17.820313 18.003906 17.34375 19.3125 C 17.046875 19.230469 16.828125 19 16.5 19 C 15.285156 19 14.375 19.738281 13.75 20.6875 L 9.96875 18.1875 L 4.75 14.75 Z M 13.9375 9 C 13.242188 9.007813 12.566406 9.378906 12.21875 10.125 L 12.03125 10.53125 L 11.625 10.59375 C 10.03125 10.855469 9.421875 12.863281 10.59375 14 L 10.90625 14.28125 L 10.84375 14.6875 C 10.59375 16.316406 12.269531 17.539063 13.6875 16.75 L 14.0625 16.5625 L 14.40625 16.75 C 15.84375 17.496094 17.515625 16.214844 17.21875 14.59375 L 17.125 14.1875 L 17.4375 13.90625 C 18.578125 12.738281 17.910156 10.746094 16.3125 10.53125 L 15.90625 10.46875 L 15.71875 10.09375 C 15.351563 9.359375 14.632813 8.992188 13.9375 9 Z M 14 12 C 14.550781 12 15 12.449219 15 13 C 14.996094 13.554688 14.550781 14 14 14 C 13.449219 14 13 13.554688 13 13 C 13 12.449219 13.445313 11.996094 14 12 Z M 22.1875 21.78125 C 22.039063 21.777344 21.925781 21.820313 21.84375 21.90625 C 21.515625 22.242188 21.9375 23.179688 22.78125 24 C 23.625 24.820313 24.546875 25.210938 24.875 24.875 C 25.203125 24.539063 24.8125 23.601563 23.96875 22.78125 C 23.335938 22.167969 22.632813 21.789063 22.1875 21.78125 Z M 27.25 22.9375 C 26.855469 23.078125 26.445313 23.859375 26.3125 24.84375 C 26.160156 25.96875 26.425781 26.9375 26.875 27 C 27.324219 27.0625 27.816406 26.1875 27.96875 25.0625 C 28.121094 23.9375 27.855469 23 27.40625 22.9375 C 27.351563 22.929688 27.304688 22.917969 27.25 22.9375 Z M 22.09375 26 C 21.703125 26.003906 21.402344 26.125 21.3125 26.34375 C 21.132813 26.777344 21.804688 27.457031 22.8125 27.875 C 23.820313 28.292969 24.789063 28.277344 24.96875 27.84375 C 25.148438 27.410156 24.476563 26.730469 23.46875 26.3125 C 22.964844 26.105469 22.484375 25.996094 22.09375 26 Z M 27.875 28.3125 C 26.699219 28.3125 25.75 28.6875 25.75 29.15625 C 25.75 29.625 26.699219 30 27.875 30 C 29.050781 30 30 29.625 30 29.15625 C 30 28.6875 29.050781 28.3125 27.875 28.3125 Z "/>
+<path style=" fill:#E0AC6E;" d="M 36 20 L 16 6 L 4 23 L 25 37 L 31 37 L 38.070313 25.394531 Z "/>
+<path style=" fill:#5D4037;" d="M 36.484375 35.726563 C 37.742188 36.925781 39.226563 37.355469 39.78125 36.679688 C 40.34375 36 39.773438 34.476563 38.515625 33.273438 C 37.253906 32.074219 35.777344 31.644531 35.214844 32.320313 C 34.652344 32.996094 35.226563 34.523438 36.484375 35.726563 Z "/>
+<path style=" fill:#5D4037;" d="M 30.359375 38.433594 C 31.976563 39.203125 33.578125 39.183594 33.929688 38.390625 C 34.285156 37.597656 33.257813 36.328125 31.640625 35.5625 C 30.023438 34.796875 28.421875 34.8125 28.070313 35.605469 C 27.714844 36.398438 28.742188 37.664063 30.359375 38.433594 Z "/>
+<path style=" fill:#5D4037;" d="M 29.484375 31.726563 C 30.742188 32.925781 32.226563 33.355469 32.78125 32.679688 C 33.34375 32 32.773438 30.476563 31.515625 29.273438 C 30.253906 28.074219 28.777344 27.644531 28.214844 28.320313 C 27.652344 28.996094 28.226563 30.523438 29.484375 31.726563 Z "/>
+<path style=" fill:#5D4037;" d="M 43 41.5 C 43 40.671875 41.65625 40 40 40 C 38.34375 40 37 40.671875 37 41.5 C 37 42.328125 38.34375 43 40 43 C 41.65625 43 43 42.328125 43 41.5 Z "/>
+<path style=" fill:#FFCC80;" d="M 16 6 L 18.214844 11.652344 L 10 23 L 4 23 L 25 37 L 36 20 Z "/>
+<path style=" fill:#558B2F;" d="M 28 23 C 28 26.316406 25.316406 29 22 29 C 18.683594 29 16 26.316406 16 23 C 16 19.683594 18.683594 17 22 17 C 25.316406 17 28 19.683594 28 23 "/>
+<path style=" fill:#FFFFFF;" d="M 20.535156 19.941406 C 20.535156 19.113281 21.191406 18.445313 22 18.445313 C 22.808594 18.445313 23.464844 19.113281 23.464844 19.941406 C 23.464844 20.773438 22 22.945313 22 22.945313 C 22 22.945313 20.535156 20.773438 20.535156 19.941406 "/>
+<path style=" fill:#FFFFFF;" d="M 23.464844 25.945313 C 23.464844 26.777344 22.808594 27.445313 22 27.445313 C 21.191406 27.445313 20.535156 26.777344 20.535156 25.945313 C 20.535156 25.113281 22 22.945313 22 22.945313 C 22 22.945313 23.464844 25.113281 23.464844 25.945313 "/>
+<path style=" fill:#FFFFFF;" d="M 18.730469 22.742188 C 18.03125 22.328125 17.792969 21.414063 18.195313 20.695313 C 18.597656 19.976563 19.496094 19.730469 20.195313 20.148438 C 20.894531 20.5625 22 22.945313 22 22.945313 C 22 22.945313 19.433594 23.15625 18.730469 22.742188 "/>
+<path style=" fill:#FFFFFF;" d="M 25.269531 23.144531 C 25.96875 23.5625 26.207031 24.476563 25.804688 25.195313 C 25.402344 25.914063 24.503906 26.160156 23.804688 25.742188 C 23.101563 25.328125 22 22.945313 22 22.945313 C 22 22.945313 24.566406 22.730469 25.269531 23.144531 "/>
+<path style=" fill:#FFFFFF;" d="M 25.269531 22.742188 C 25.96875 22.328125 26.207031 21.414063 25.804688 20.695313 C 25.402344 19.976563 24.503906 19.730469 23.804688 20.148438 C 23.101563 20.5625 22 22.945313 22 22.945313 C 22 22.945313 24.566406 23.15625 25.269531 22.742188 "/>
+<path style=" fill:#FFFFFF;" d="M 18.730469 23.144531 C 18.03125 23.5625 17.792969 24.476563 18.195313 25.195313 C 18.597656 25.914063 19.496094 26.160156 20.195313 25.742188 C 20.894531 25.328125 22 22.945313 22 22.945313 C 22 22.945313 19.433594 22.730469 18.730469 23.144531 "/>
+<path style=" fill:#FFC107;" d="M 23.5 23 C 23.5 23.828125 22.828125 24.5 22 24.5 C 21.171875 24.5 20.5 23.828125 20.5 23 C 20.5 22.171875 21.171875 21.5 22 21.5 C 22.828125 21.5 23.5 22.171875 23.5 23 "/>
 </g>
 </svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/slug-eating.svg b/app/assets/images/icons/slug-eating.svg
new file mode 100644
index 000000000..37779e14d
--- /dev/null
+++ b/app/assets/images/icons/slug-eating.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M20.6 8H28.400000000000002V10H20.6z" transform="rotate(-50.193 24.499 9.004)"/><path fill="#795548" d="M15.5 5.2H17.5V13.8H15.5z" transform="rotate(-35.537 16.501 9.504)"/><path fill="#795548" d="M24,13.9L24,13.9c-0.3-1.6-1.7-2.9-3.5-2.9c-1.9,0-3.5,1.6-3.5,3.5c0,0.2,0,0.4,0.1,0.6v0 c0,0,0,0.1,0,0.1C19,29,17,32.9,12.7,34c-7.7,2-7,5-7,5s0,2,2,2s6.3,0,6.3,0s12,0,12-12C26,22,25,20.9,24,13.9z"/><path fill="#bcaaa4" d="M24,14.3c-0.3-0.7-1-1.3-2-1.3c-1.1,0-2,0.9-2,2c0,0.3,3.5,13,1,18c-3,6-8,6-10,6 c-1.5,0,0.4,0-5.3,0v0c0,0,0,2,2,2s6.3,0,6.3,0s13,1,13-10C27,24.1,25,22,24,14.3z"/><path fill="#8bc34a" d="M31,41c-0.3,0-0.6-0.1-0.8-0.4c-0.3-0.4-0.2-1.1,0.2-1.4c0.3-0.2,6.4-4.9,5.1-13 c-0.1-0.5,0.3-1.1,0.8-1.1c0.6-0.1,1.1,0.3,1.1,0.8c1.4,9.4-5.6,14.7-5.9,15C31.4,40.9,31.2,41,31,41z"/><path fill="#8bc34a" d="M37.1,17c-0.3,0.9-1.2,1.9-2.4,2.9c0.2,0.3,0.4,0.7,0.4,1.1c0,1.1-0.9,2-2,2c-0.2,0-0.4,0-0.6-0.1 c0.4,0.4,0.6,1,0.6,1.6c0,1.4-1.1,2.5-2.5,2.5c-0.8,0-1.5-0.4-1.9-0.9c-0.3,0.7-0.5,1.3-0.6,2.1c-0.2,3.6,2,5.9,6.9,4.6 c2.9,2.7,7.2,0.8,7.9-2.8C43.9,24.9,38.3,18.5,37.1,17z"/><path fill="#689f38" d="M37.1,17C37.1,17,37.1,17,37.1,17c-0.3,0.9-1.2,1.9-2.4,2.9c0.2,0.3,0.4,0.7,0.4,1.1 c0,1.1-0.9,2-2,2c-0.2,0-0.4,0-0.6-0.1c0.4,0.4,0.6,1,0.6,1.6c0,1.4-1.1,2.5-2.5,2.5c-0.8,0-1.5-0.4-1.9-0.9 c-0.3,0.7-0.5,1.3-0.6,2.1c-0.2,3.6,2,5.9,6.9,4.6c0,0,0,0,0,0C37.7,24,37.5,19.3,37.1,17z"/><path fill="#5d4037" d="M28 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S28 5.9 28 7zM17 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S17 5.9 17 7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/slug.svg b/app/assets/images/icons/slug.svg
new file mode 100644
index 000000000..fd1c93e6e
--- /dev/null
+++ b/app/assets/images/icons/slug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M34.6 8H42.4V10H34.6z" transform="rotate(-50.208 38.5 9.003)"/><path fill="#795548" d="M29.5 5.2H31.5V13.8H29.5z" transform="rotate(-35.537 30.502 9.504)"/><path fill="#795548" d="M38,13.9L38,13.9c-0.3-1.6-1.7-2.9-3.5-2.9c-1.9,0-3.5,1.6-3.5,3.5c0,0.2,0,0.4,0.1,0.6v0 c0,0,0,0.1,0,0.1C34,30.1,27,31,19,32C7.9,33.4,6,39,6,39s0,2,2,2s20,0,20,0s12,0,12-12C40,22,39,20.9,38,13.9z"/><path fill="#bcaaa4" d="M38,14.3c-0.3-0.7-1-1.3-2-1.3c-1.1,0-2,0.9-2,2c0,0.3,2.5,13,0,18c-3,6-7,6-9,6c-1.5,0-13.3,0-19,0 v0c0,0,0,2,2,2s20,0,20,0s13,1,13-11C41,23.1,39,22,38,14.3z"/><path fill="#5d4037" d="M42 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S42 5.9 42 7zM31 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S31 5.9 31 7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/snail.svg b/app/assets/images/icons/snail.svg
new file mode 100644
index 000000000..bdeee93f0
--- /dev/null
+++ b/app/assets/images/icons/snail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M38,13.9L38,13.9c-0.3-1.6-1.7-2.9-3.5-2.9c-1.9,0-3.5,1.6-3.5,3.5c0,0.2,0,0.4,0.1,0.6v0 c0,0,0,0.1,0,0.1C34,30.1,27,31,19,32C7.9,33.4,6,39,6,39s0,2,2,2s20,0,20,0s12,0,12-12C40,22,39,20.9,38,13.9z"/><path fill="#795548" d="M34.6 8H42.4V10H34.6z" transform="rotate(-50.208 38.5 8.98)"/><path fill="#795548" d="M29.5 5.2H31.5V13.8H29.5z" transform="rotate(-35.537 30.502 9.481)"/><path fill="#5d4037" d="M42 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2S42 5.9 42 7zM31 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2S31 5.9 31 7z"/><path fill="#bcaaa4" d="M38,14.2c-0.3-0.7-1-1.3-2-1.3c-1.1,0-2,0.9-2,2c0,0.3,2.5,13,0,18c-3,6-7,6-9,6c-1.5,0-13.3,0-19,0 c0,0,0,2,2,2s20,0,20,0s13,1,13-11C41,23.1,39,22,38,14.2z"/><path fill="#4e342e" d="M31.8,19.9C31.7,19.9,31.7,19.9,31.8,19.9C32.4,30.3,26,31.1,19,32c-2.5,0.3-4.6,0.9-6.3,1.5 c-0.4,0.3-0.7,0.4-0.9,0.4c0,0,0,0,0,0c-0.4,0.2-0.7,0.3-1,0.5c0,0,0,0,0,0c-0.3,0.2-0.6,0.3-0.9,0.5c0,0,0,0,0,0 c1.8,1.4,4,2.4,6.3,2.8c0.3,0.1,0.6,0.1,1,0.2c0.1,0,0.2,0,0.3,0c0.6,0.1,1.4,0.1,2.2,0.1c0.7,0,1.3,0,1.9-0.1l0.4-0.1l0.4-0.2 c1.2-0.7,2.2-1.5,3.1-2.4c0.8-0.8,1.5-1.7,2-2.6c3-0.7,6.3-2.5,6.4-6.1C34,26.3,34.3,23.4,31.8,19.9z"/><path fill="#ff9800" d="M6,23c0-3.3,1.3-6.4,3.3-8.7c2.4-2.7,5.8-4.3,9.7-4.3c7.2,0,13,5.8,13,13c0,0.1,0.2,1.9-0.2,3.4 C30.7,31.5,25,31,25,31s-3.1,5-6,5C11.8,36,6,30.2,6,23z"/><path fill="#ffb74d" d="M17.4 16c.2 0 .4 0 .6 0 .5 0 1 .1 1.5.1.6-1.3 1.3-3.5 1.1-6C20.1 10.1 19.6 10 19 10c-.1 0-.2 0-.3 0C18.8 12.7 17.8 15.1 17.4 16zM14.5 16.8c.7-.3 1.4-.6 2.1-.7.2-1.7.1-3.8-.7-5.8-.7.2-1.3.4-1.9.6C14.8 13 14.7 15.3 14.5 16.8zM22.6 17.5c.8-1.3 2-3.5 2.4-6-.6-.3-1.2-.6-1.9-.8-.3 2.4-1.5 4.7-2.3 5.8C21.5 16.8 22.1 17.1 22.6 17.5zM9.4 23.8l.6.4c0-.1 0-.1 0-.2 0-.7.1-1.4.3-2-.6-.3-2.1-1-4.1-.9C6.1 21.7 6 22.4 6 23c0 0 0 .1 0 .1C8 22.9 9.4 23.8 9.4 23.8zM10.2 19.6l.6.8.2-.1c.7-1.3 1.7-2.4 3-3.1-.3-1.5-1.1-3.2-2.5-4.7-.5.4-1 .8-1.5 1.3C11.3 15.2 12 17 12 18v.7l-.2-.3c-.1-.1-1.2-1.8-3.5-2.8-.4.6-.7 1.1-1 1.7C9.1 18.1 10.1 19.5 10.2 19.6zM10.1 24.9l-.4.1c-.1 0-1.7.6-3 2 .2.7.5 1.4.9 2.1 1.1-1.6 2.7-2.2 2.8-2.2l.2-.1C10.3 26.3 10.1 25.6 10.1 24.9zM25.7 22.1l.7 1.9c1.5-.5 3.8-2.1 5-5-.3-1-.8-2-1.3-2.8C29.6 20.6 25.9 22 25.7 22.1zM24.4 19.9c.2-.1 3.1-1.6 4.1-5.6-.5-.6-1.1-1.1-1.7-1.6-.6 3.9-3.2 5.4-3.3 5.4l-.9.4L24.4 19.9zM26.2 29c1.5-.3 4-1.3 5.8-3.4.2-1.3 0-2.5 0-2.6 0-.5 0-1.1-.1-1.6C30.8 26.1 26 27 25.8 27l-.7 2.1L26.2 29z"/><path fill="#ce630b" d="M24.1,17.7C22.3,16,20,15,17.5,15c-2.5,0-4.8,1-6.6,2.7c-3,3-3,7.8,0,10.8c2.5,2.5,6.5,2.5,8.9,0 c1-1,1.5-2.3,1.5-3.7s-0.5-2.7-1.5-3.7c-0.8-0.8-1.9-1.3-3.1-1.3c-1.2,0-2.3,0.5-3.1,1.3c-1.5,1.5-1.5,3.8,0,5.3 c1.2,1.2,3.3,1.2,4.5,0c0.4-0.4,0.4-1,0-1.4s-1-0.4-1.4,0c-0.5,0.5-1.2,0.5-1.7,0c-0.7-0.7-0.7-1.8,0-2.4c0.9-0.9,2.5-0.9,3.4,0 c0.6,0.6,1,1.4,1,2.3c0,0.9-0.3,1.7-1,2.3c-1.7,1.7-4.4,1.7-6.1,0c-2.2-2.2-2.2-5.8,0-8c1.4-1.4,3.2-2.1,5.2-2.1 c2,0,3.8,0.8,5.2,2.1c3.7,3.7,3.7,9.6,0,13.3c-1.7,1.7-3.9,2.9-6.2,3.3c1.1,0.2,3,0.5,4.9,0.2c1-0.6,1.9-1.3,2.7-2.1 C28.5,29.4,28.5,22.2,24.1,17.7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/spiderweb.svg b/app/assets/images/icons/spiderweb.svg
new file mode 100644
index 000000000..634bf37ee
--- /dev/null
+++ b/app/assets/images/icons/spiderweb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#c5cae9" d="M20.5,31.1l0.1-2.1c0,0,0-1-0.7-1.7c-0.7-0.7-1.9-0.8-1.9-0.8l-2-0.1l1.2-1.5 c0.2-0.3,0.8-1.1,0.8-1.9s-0.6-1.6-0.8-1.9l-1.1-1.4l1.8-0.2c0.3,0,1.4-0.3,1.9-0.8c0.5-0.5,0.7-1.5,0.7-1.8l0.1-1.7l1.4,1 c0.5,0.3,1.4,0.8,1.9,0.8c0.5,0,1.4-0.5,1.9-0.8l1.3-0.9l0.3,1.5c0.1,0.4,0.4,1.4,0.9,2c0.6,0.6,1.7,0.7,1.7,0.7l1.9,0.1l-1.2,1.5 C30.6,21.4,30,22.3,30,23c0,0.7,0.5,1.5,0.8,1.9l1.2,1.6l-2,0.1c0,0-1.2,0.1-1.8,0.7c-0.7,0.7-0.7,1.8-0.7,1.8l-0.1,2l-1.5-1.2 C25.6,29.6,24.7,29,24,29s-1.6,0.6-1.9,0.8L20.5,31.1z M24,27c0.6,0,1.3,0.2,1.8,0.4c0.2-0.5,0.5-1.1,1-1.6s1.1-0.8,1.6-1 C28.2,24.3,28,23.6,28,23c0-0.7,0.2-1.3,0.5-1.8c-0.5-0.2-1-0.5-1.5-1c-0.5-0.5-0.9-1.1-1.1-1.7C25.3,18.8,24.6,19,24,19 c-0.6,0-1.3-0.2-1.8-0.5c-0.2,0.6-0.5,1.2-1,1.6c-0.5,0.5-1.1,0.8-1.7,1c0.2,0.5,0.4,1.2,0.4,1.8c0,0.7-0.2,1.3-0.4,1.8 c0.6,0.2,1.2,0.5,1.7,1c0.5,0.5,0.8,1,1,1.6C22.8,27.2,23.4,27,24,27z"/><path fill="#c5cae9" d="M29.4,36.1l-0.7-0.3c0,0-2.6-0.9-4.6-0.9c-2,0-4.6,0.9-4.6,0.9l-0.7,0.2l-0.4-0.6c0,0-1.4-2-3-3.6 c-1.6-1.6-3.7-3.1-3.8-3.1l-0.6-0.4l0.2-0.7c0.2-0.9,0.9-3.4,0.9-4.7c0-1.3-0.6-3.8-0.9-4.7l-0.2-0.7l0.7-0.4c0,0,2.5-1.5,3.8-2.8 c1.3-1.3,2.8-3.8,2.8-3.8l0.5-0.7l0.8,0.3c0,0,2,0.8,4.5,0.8c2.6,0,4.5-0.8,4.5-0.8l0.8-0.3l0.5,0.7c0,0,1.4,2.2,3.1,3.9 c1.7,1.7,3.5,2.7,3.5,2.7l0.8,0.4l-0.4,0.8c0,0-0.8,2-0.8,4.5c0,2.6,0.8,4.5,0.8,4.5l0.3,0.7l-0.7,0.5c0,0-2.3,1.6-3.9,3.3 c-1.6,1.6-2.8,3.4-2.8,3.4L29.4,36.1z M13.2,27.5c0.8,0.6,2.2,1.7,3.4,2.9c1.2,1.2,2.2,2.5,2.8,3.3c1-0.3,2.9-0.8,4.6-0.8 c1.7,0,3.5,0.5,4.5,0.8c0.5-0.7,1.5-2,2.6-3.1c1.2-1.2,2.7-2.4,3.6-3C34.4,26.7,34,25,34,23c0-1.9,0.4-3.6,0.7-4.5 c-0.8-0.5-2-1.4-3.2-2.6c-1.3-1.3-2.4-2.8-2.9-3.6C27.6,12.6,26,13,24,13c-1.9,0-3.6-0.4-4.5-0.7c-0.6,0.9-1.7,2.5-2.7,3.5 c-1,1-2.7,2.1-3.6,2.7c0.3,1.1,0.8,3.1,0.8,4.5C14,24.4,13.5,26.5,13.2,27.5z"/><path fill="#c5cae9" d="M32.5,43.5l-1.1-0.6c0,0-3.6-1.9-7.4-1.9c-3.9,0-7.4,1.9-7.4,1.9l-1.1,0.6l-0.3-1.2 c0,0-1-3.9-3.8-6.6c-2.8-2.8-6.6-3.8-6.6-3.8l-1.2-0.3l0.5-1.1c0,0,1.9-4,1.9-7.4c0-3.5-1.3-7.2-1.4-7.3l-0.3-1l1-0.3 c0,0,3.8-1.3,6.6-4.1c2.7-2.7,3.8-5.6,3.8-5.6l0.5-1.3l1.1,0.9c0,0,2.3,1.7,6.8,1.7c4.5,0,6.8-1.9,6.9-1.9l1.2-1l0.4,1.5 c0,0,0.9,3.2,4.1,6.3c2.3,2.2,5.8,3.7,5.9,3.7l1,0.4l-0.4,1c0,0-1,2.3-1,7.1c0,4.7,1.8,7.3,1.8,7.3l0.9,1.2l-1.4,0.4 c0,0-3.7,0.9-6.6,3.8c-2.9,2.9-3.8,6.6-3.8,6.6L32.5,43.5z M6.4,30.3c1.5,0.5,4.2,1.8,6.4,4c2.2,2.2,3.4,4.9,4,6.4 C18.2,40,21,39,24,39c3,0,5.8,1,7.3,1.6c0.5-1.5,1.7-4.1,4-6.4c2.2-2.2,4.8-3.4,6.3-3.9C40.9,28.9,40,26.5,40,23 c0-3.5,0.5-5.8,0.9-7c-1.3-0.6-3.7-1.9-5.6-3.7c-2.4-2.3-3.7-4.6-4.2-6C29.7,7.1,27.4,8,24,8c-3.4,0-5.7-0.9-7-1.5 c-0.6,1.2-1.8,3.3-3.8,5.3C11,14,8.2,15.4,6.8,16C7.3,17.4,8,20.2,8,23C8,25.8,7,28.7,6.4,30.3z"/><path fill="#c5cae9" d="M22.2 24.8L31.3 2.7 33.2 3.5 25.8 21.2 43.5 13.8 44.3 15.7z"/><path fill="#c5cae9" d="M31.8 44.2L22.1 21.1 45.1 30.6 44.3 32.5 25.9 24.9 33.6 43.4z"/><path fill="#c5cae9" d="M16.4 44.2L14.5 43.4 22.2 24.8 3.5 32.6 2.7 30.7 25.8 21.2z"/><path fill="#c5cae9" d="M25.8 24.8L3.7 15.7 4.5 13.8 22.2 21.2 14.8 3.5 16.7 2.7z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/sprinkler.svg b/app/assets/images/icons/sprinkler.svg
new file mode 100644
index 000000000..3458f029f
--- /dev/null
+++ b/app/assets/images/icons/sprinkler.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><polygon fill="#546e7a" points="19.78,10 21.181,16 26.819,16 28.22,10"/><polygon fill="#90a4ae" points="21,15 21,41.674 27,41.108 27,15"/><rect width="10" height="2" x="19" y="9" fill="#78909c"/><path fill="#42a5f5" d="M9,14c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,14,9,14z"/><path fill="#42a5f5" d="M9,18c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,18,9,18z"/><path fill="#42a5f5" d="M9,10c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,10,9,10z"/><path fill="#42a5f5" d="M9,6C8.449,6,8,5.551,8,5s0.449-1,1-1s1,0.449,1,1S9.551,6,9,6z"/><path fill="#42a5f5" d="M13,14c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S13.551,14,13,14z"/><path fill="#42a5f5" d="M13,18c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S13.551,18,13,18z"/><path fill="#42a5f5" d="M13,10c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S13.551,10,13,10z"/><path fill="#42a5f5" d="M17,14c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S17.551,14,17,14z"/><path fill="#42a5f5" d="M9,22c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,22,9,22z"/><path fill="#42a5f5" d="M38,13c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,13.551,38,13z"/><path fill="#42a5f5" d="M38,17c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,17.551,38,17z"/><path fill="#42a5f5" d="M38,9c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,9.551,38,9z"/><path fill="#42a5f5" d="M38,5c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,5.551,38,5z"/><path fill="#42a5f5" d="M34,13c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S34,13.551,34,13z"/><path fill="#42a5f5" d="M34,17c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S34,17.551,34,17z"/><path fill="#42a5f5" d="M34,9c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S34,9.551,34,9z"/><path fill="#42a5f5" d="M30,13c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S30,13.551,30,13z"/><path fill="#42a5f5" d="M38,21c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,21.551,38,21z"/><path fill="#388e3c" d="M23.859,44c0-9.376,4.958-17.143,6.141-18.761c-0.581,1.532-2.048,4.392-2.048,18.761H23.859z"/><path fill="#4caf50" d="M20.437,32.952C20.676,33.748,21.841,39.193,22,40c1.638,2.673,0.997,1.129,1,4h2.333	c-0.161-1.963-0.495-3.972-0.991-5.909c-0.501-1.942-1.182-3.847-2.073-5.67c-0.887-1.823-1.983-3.564-3.293-5.165	c-1.315-1.592-2.817-3.085-4.621-4.239c1.585,1.359,2.789,2.988,3.792,4.664C19.142,29.369,19.893,31.144,20.437,32.952z"/><path fill="#388e3c" d="M25.793,44c0-7.57,7.072-16.249,9.029-17.66c-1.086,1.294-4.825,6.761-4.825,17.66H25.793z"/><path fill="#8bc34a" d="M29.018,44c0-7.531,7.237-13.622,8.386-14.373c-0.922,0.949-4.492,6.088-4.492,14.373H29.018z"/><path fill="#8bc34a" d="M16,44c0-8.304-4.005-13.449-5-14.373c1.212,0.718,9,7.052,9,14.373H16z"/><path fill="#8bc34a" d="M31.249,44C33,39,37.687,37.45,39,37c-2,2-3,4-3,7H31.249z"/><path fill="#8bc34a" d="M14.249,44c-0.249-3-2.249-7-4-9c2.751,1,6,4,7.751,9H14.249z"/><path fill="#388e3c" d="M19.16,44c0-9.389-2.633-14.288-3.515-15.464C16.784,29.543,24,37.381,24,44H19.16z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/sprout-add.svg b/app/assets/images/icons/sprout-add.svg
new file mode 100644
index 000000000..e58159cd7
--- /dev/null
+++ b/app/assets/images/icons/sprout-add.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1">
+<g id="surface1026554">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,76.470588%,29.019608%);fill-opacity:1;" d="M 30.800781 18.199219 C 28.398438 18.898438 27.199219 21.601562 28.699219 23.601562 C 27.800781 24.101562 26.601562 25.199219 25.5 26.898438 C 25.398438 22.5 25.800781 18.199219 26.800781 15.101562 C 28.199219 16.5 29.898438 16.300781 31.398438 15 C 34.101562 12.601562 31.699219 6.898438 32.898438 5.101562 C 31.5 5.101562 26 5.601562 23.699219 8.398438 C 22.199219 10.300781 22.800781 13 25.300781 13.5 C 23.898438 16.898438 23.398438 21.800781 23.398438 26.601562 C 22.601562 25.398438 21.5 24.199219 20.101562 23.300781 C 22.898438 21.101562 22.101562 17.601562 19.199219 16.101562 C 14.898438 13.699219 7.800781 16.300781 6 17 C 8.601562 18.601562 8.398438 27 13.199219 28.601562 C 16.300781 29.601562 18.699219 28.601562 19.300781 24.898438 C 23.300781 27.800781 24 33 24.101562 33.101562 C 24.199219 33.601562 24.601562 34 25.101562 34 L 25.199219 34 C 25.699219 33.898438 26.101562 33.5 26.101562 33 C 26.101562 29.101562 27.898438 26.898438 29.199219 25.898438 C 29.300781 28.398438 31 29.398438 33.398438 29.199219 C 37.300781 28.699219 38.800781 22.101562 41.101562 21.199219 C 39.800781 20.199219 34.601562 17.199219 30.800781 18.199219 Z M 30.800781 18.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,62.352941%,21.960784%);fill-opacity:1;" d="M 13.199219 28.601562 C 8.398438 27 8.601562 18.601562 6 17 C 8.300781 17.199219 11.800781 19.101562 19.398438 23.800781 C 19.101562 28.398438 16.601562 29.699219 13.199219 28.601562 Z M 33.300781 29 C 37.199219 28.5 38.699219 21.898438 41 21 C 39.199219 20.800781 35.800781 21.699219 29.199219 24.101562 C 28.601562 27.800781 30.5 29.300781 33.300781 29 Z M 31.5 14.898438 C 34.601562 11.898438 31.800781 6.800781 33 5 C 31.5 5.800781 29.398438 8.199219 25.800781 13.5 C 27.300781 16.5 29.5 16.601562 31.5 14.898438 Z M 31.5 14.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.45098%,33.333333%,28.235294%);fill-opacity:1;" d="M 9 42 L 40.601562 42 C 41.398438 41.300781 42 40.199219 42 39 C 42 36.800781 40.199219 35 38 35 C 37.601562 35 37.199219 35.101562 36.800781 35.199219 C 36.199219 33.300781 34.5 32 32.5 32 C 31.199219 32 30 32.601562 29.199219 33.398438 C 28.101562 32.5 26.601562 32 25 32 C 22.898438 32 21 32.898438 19.699219 34.398438 C 19.199219 34.199219 18.601562 34 18 34 C 16.898438 34 16 34.398438 15.300781 35.101562 C 14.699219 34.398438 13.898438 34 13 34 C 11.601562 34 10.5 34.898438 10.101562 36.199219 C 9.800781 36.101562 9.398438 36 9 36 C 7.300781 36 6 37.300781 6 39 C 6 40.699219 7.300781 42 9 42 Z M 9 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55.294118%,43.137255%,38.823529%);fill-opacity:1;" d="M 38 40 C 38 38.300781 36.699219 37 35 37 C 33.5 37 32.300781 38.101562 32.101562 39.398438 C 31.300781 38.601562 30.199219 38 29 38 C 27.699219 38 26.5 38.699219 25.800781 39.699219 C 25.300781 38.101562 23.800781 37 22 37 C 20.898438 37 20 37.398438 19.300781 38.101562 C 18.699219 37.398438 17.898438 37 17 37 C 15.601562 37 14.5 37.898438 14.101562 39.199219 C 13.800781 39.101562 13.398438 39 13 39 C 11.101562 39 9.601562 40.300781 9.101562 42 L 40 42 C 39.800781 41 39 40.199219 38 40 Z M 38 40 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(26.27451%,62.745098%,27.843137%);fill-opacity:1;" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36 "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/sprout.svg b/app/assets/images/icons/sprout.svg
new file mode 100644
index 000000000..bfebc1bb5
--- /dev/null
+++ b/app/assets/images/icons/sprout.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#8BC34A" d="M30.8,18.2c-2.4,0.7-3.6,3.4-2.1,5.4c-0.9,0.5-2.1,1.6-3.2,3.3c-0.1-4.4,0.3-8.7,1.3-11.8c1.4,1.4,3.1,1.2,4.6-0.1c2.7-2.4,0.3-8.1,1.5-9.9c-1.4,0-6.9,0.5-9.2,3.3c-1.5,1.9-0.9,4.6,1.6,5.1c-1.4,3.4-1.9,8.3-1.9,13.1c-0.8-1.2-1.9-2.4-3.3-3.3c2.8-2.2,2-5.7-0.9-7.2C14.9,13.7,7.8,16.3,6,17c2.6,1.6,2.4,10,7.2,11.6c3.1,1,5.5,0,6.1-3.7c4,2.9,4.7,8.1,4.8,8.2c0.1,0.5,0.5,0.9,1,0.9c0,0,0.1,0,0.1,0c0.5-0.1,0.9-0.5,0.9-1l0,0c0-3.9,1.8-6.1,3.1-7.1c0.1,2.5,1.8,3.5,4.2,3.3c3.9-0.5,5.4-7.1,7.7-8C39.8,20.2,34.6,17.2,30.8,18.2z"/><path fill="#689F38" d="M13.2,28.6C8.4,27,8.6,18.6,6,17c0,0,0,0,0,0c2.3,0.2,5.8,2.1,13.4,6.8c0,0,0,0,0,0C19.1,28.4,16.6,29.7,13.2,28.6z M33.3,29c3.9-0.5,5.4-7.1,7.7-8c0,0,0,0,0,0c-1.8-0.2-5.2,0.7-11.8,3.1c0,0,0,0,0,0C28.6,27.8,30.5,29.3,33.3,29z M31.5,14.9c3.1-3,0.3-8.1,1.5-9.9c0,0,0,0,0,0c-1.5,0.8-3.6,3.2-7.2,8.5c0,0,0,0,0,0C27.3,16.5,29.5,16.6,31.5,14.9z"/><path fill="#795548" d="M9,42h9.7h12.6h4.1h5.2c0.8-0.7,1.4-1.8,1.4-3c0-2.2-1.8-4-4-4c-0.4,0-0.8,0.1-1.2,0.2c-0.6-1.9-2.3-3.2-4.3-3.2c-1.3,0-2.5,0.6-3.3,1.4C28.1,32.5,26.6,32,25,32c-2.1,0-4,0.9-5.3,2.4C19.2,34.2,18.6,34,18,34c-1.1,0-2,0.4-2.7,1.1C14.7,34.4,13.9,34,13,34c-1.4,0-2.5,0.9-2.9,2.2C9.8,36.1,9.4,36,9,36c-1.7,0-3,1.3-3,3S7.3,42,9,42z"/><path fill="#8D6E63" d="M38,40C38,40,38,40,38,40c0-1.7-1.3-3-3-3c-1.5,0-2.7,1.1-2.9,2.4C31.3,38.6,30.2,38,29,38c-1.3,0-2.5,0.7-3.2,1.7c-0.5-1.6-2-2.7-3.8-2.7c-1.1,0-2,0.4-2.7,1.1C18.7,37.4,17.9,37,17,37c-1.4,0-2.5,0.9-2.9,2.2C13.8,39.1,13.4,39,13,39c-1.9,0-3.4,1.3-3.9,3h26h2.1H40C39.8,41,39,40.2,38,40z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/stones.svg b/app/assets/images/icons/stones.svg
new file mode 100644
index 000000000..06585a21b
--- /dev/null
+++ b/app/assets/images/icons/stones.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#607d8b" d="M43,36.333C43,32.651,36.15,28,24,28S5,32.651,5,36.333C5,40.015,11.85,43,24,43S43,40.015,43,36.333z"/><path fill="#d7ccc8" d="M41,23.923C41,20.864,31.864,16,27,16c-8.837,0-16,2.864-16,5.923s7.181,5.617,16,6.177C35.776,28.657,41,26.982,41,23.923z"/><path fill="#607d8b" d="M31,11c0-2.209-4.029-4-9-4s-9,3.791-9,6s4.029,3.192,9,3.192S31,13.209,31,11z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/timeline.svg b/app/assets/images/icons/timeline.svg
new file mode 100644
index 000000000..e1e151dda
--- /dev/null
+++ b/app/assets/images/icons/timeline.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="96px" height="96px">
+<g id="surface1">
+<path style=" fill:#CFD8DC;" d="M 5 38 L 5 14 L 43 14 L 43 38 C 43 40.199219 41.199219 42 39 42 L 9 42 C 6.800781 42 5 40.199219 5 38 Z "/>
+<path style=" fill:#F44336;" d="M 43 10 L 43 16 L 5 16 L 5 10 C 5 7.800781 6.800781 6 9 6 L 39 6 C 41.199219 6 43 7.800781 43 10 Z "/>
+<path style=" fill:#B71C1C;" d="M 36 10 C 36 11.65625 34.65625 13 33 13 C 31.34375 13 30 11.65625 30 10 C 30 8.34375 31.34375 7 33 7 C 34.65625 7 36 8.34375 36 10 Z "/>
+<path style=" fill:#B71C1C;" d="M 18 10 C 18 11.65625 16.65625 13 15 13 C 13.34375 13 12 11.65625 12 10 C 12 8.34375 13.34375 7 15 7 C 16.65625 7 18 8.34375 18 10 Z "/>
+<path style=" fill:#B0BEC5;" d="M 33 3 C 31.898438 3 31 3.898438 31 5 L 31 10 C 31 11.101563 31.898438 12 33 12 C 34.101563 12 35 11.101563 35 10 L 35 5 C 35 3.898438 34.101563 3 33 3 Z "/>
+<path style=" fill:#B0BEC5;" d="M 15 3 C 13.898438 3 13 3.898438 13 5 L 13 10 C 13 11.101563 13.898438 12 15 12 C 16.101563 12 17 11.101563 17 10 L 17 5 C 17 3.898438 16.101563 3 15 3 Z "/>
+<path style=" fill:#90A4AE;" d="M 13 20 L 17 20 L 17 24 L 13 24 Z "/>
+<path style=" fill:#90A4AE;" d="M 19 20 L 23 20 L 23 24 L 19 24 Z "/>
+<path style=" fill:#90A4AE;" d="M 25 20 L 29 20 L 29 24 L 25 24 Z "/>
+<path style=" fill:#90A4AE;" d="M 31 20 L 35 20 L 35 24 L 31 24 Z "/>
+<path style=" fill:#90A4AE;" d="M 13 26 L 17 26 L 17 30 L 13 30 Z "/>
+<path style=" fill:#90A4AE;" d="M 19 26 L 23 26 L 23 30 L 19 30 Z "/>
+<path style=" fill:#90A4AE;" d="M 25 26 L 29 26 L 29 30 L 25 30 Z "/>
+<path style=" fill:#90A4AE;" d="M 31 26 L 35 26 L 35 30 L 31 30 Z "/>
+<path style=" fill:#90A4AE;" d="M 13 32 L 17 32 L 17 36 L 13 36 Z "/>
+<path style=" fill:#90A4AE;" d="M 19 32 L 23 32 L 23 36 L 19 36 Z "/>
+<path style=" fill:#90A4AE;" d="M 25 32 L 29 32 L 29 36 L 25 36 Z "/>
+<path style=" fill:#90A4AE;" d="M 31 32 L 35 32 L 35 36 L 31 36 Z "/>
+</g>
+</svg>
diff --git a/app/assets/images/icons/watering-can.svg b/app/assets/images/icons/watering-can.svg
new file mode 100644
index 000000000..3e24501d1
--- /dev/null
+++ b/app/assets/images/icons/watering-can.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#4caf50" d="M13.4 19.2H17.4V39.9H13.4z" transform="rotate(-40.412 15.36 29.55)"/><path fill="#4caf50" d="M20.2 20.2v17.3c0 1.1.9 1.9 1.9 1.9h14.4c1.1 0 1.9-.9 1.9-1.9V22.1h-8.6v-3.8C24 18.2 20.2 20.2 20.2 20.2zM4.9 23.3l5.8-5.1c1.4 1.6 1.2 4-.4 5.4C8.7 25.1 6.3 24.9 4.9 23.3z"/><path fill="#2e7d32" d="M32.2,8.6c-6.5,0-11.7,5.1-12,11.5c0.1-0.1,0.8-0.4,2-0.8c0.6-5,4.9-8.8,10-8.8 c5.6,0,10.1,4.5,10.1,10.1c0,3.2-1.5,6.1-3.8,7.9v2.3c3.4-2.1,5.8-5.9,5.8-10.2C44.2,14,38.8,8.6,32.2,8.6z"/><path fill="#2e7d32" d="M20.2 22.1h18.2V24H20.2V22.1zM11.4 22c-.2.6-.6 1.2-1.1 1.7-.5.5-1.1.7-1.7.9l1.4 1.6c.6-.2 1.2-.6 1.7-1 .5-.4.9-1 1.2-1.5L11.4 22z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icons/wheelbarrow.svg b/app/assets/images/icons/wheelbarrow.svg
new file mode 100644
index 000000000..97d319f29
--- /dev/null
+++ b/app/assets/images/icons/wheelbarrow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 50 50"><path fill="#795548" d="M43,17c0-1.104-0.896-2-2-2c-0.438,0-0.839,0.145-1.168,0.383C39.936,15.107,40,14.812,40,14.5c0-1.381-1.119-2.5-2.5-2.5c-0.587,0-1.119,0.21-1.546,0.549C35.735,11.108,34.502,10,33,10c-0.921,0-1.734,0.424-2.285,1.078C30.001,10.415,29.052,10,28,10c-2.209,0-4,1.791-4,4c0,0.101,0.022,0.195,0.03,0.293C23.728,14.111,23.378,14,23,14c-1.104,0-2,0.896-2,2c0,0.366,0.105,0.705,0.277,1H43z"/><path fill="#FF5722" d="M19,18l2,9c0,0,7,3,13,3s11-12,11-12H19z"/><path fill="#FF5722" d="M46,19c0,0.553-0.447,1-1,1H19c-0.552,0-1-0.447-1-1v-1c0-0.553,0.448-1,1-1h26c0.553,0,1,0.447,1,1V19z"/><path fill="#37474F" d="M11 18H5c-.552 0-1 .447-1 1s.448 1 1 1h6V18zM39 30.001c-2.762 0-5 2.238-5 5s2.238 5 5 5 5-2.238 5-5S41.762 30.001 39 30.001zM39 38.001c-1.656 0-3-1.343-3-3s1.344-3 3-3 3 1.343 3 3S40.656 38.001 39 38.001z"/><path fill="#BF360C" d="M42.984,22c0.418-0.729,0.78-1.41,1.077-2H19.444l0.444,2H42.984z"/><path fill="#5D4037" d="M36.908,17C36.964,16.843,37,16.676,37,16.5c0-0.828-0.672-1.5-1.5-1.5c-0.18,0-0.35,0.037-0.51,0.095C34.992,15.063,35,15.032,35,15c0-1.104-0.896-2-2-2c-0.755,0-1.404,0.423-1.745,1.041C30.705,13.408,29.904,13,29,13c-1.657,0-3,1.343-3,3c0,0.353,0.072,0.686,0.184,1H36.908z"/><path fill="#9FA8DA" d="M39.703,34.289c-0.033-0.031-3.257-3.217-3.903-3.91c-0.861-0.939-2.28-1.08-3.458-0.35c-0.981,0.621-2.236,1.517-3.343,2.308c-0.705,0.504-1.356,0.969-1.846,1.297c-0.741,0.502-1.013,0.499-1.078,0.48c-0.298-0.063-0.856-0.968-1.126-1.404c-0.726-1.166-3.047-5.929-3.07-5.977c-0.061-0.125-0.147-0.236-0.253-0.326l-9.589-8.108c-0.091-0.077-0.194-0.128-0.3-0.166C11.594,18.056,11.439,18,11.266,18H11v0.153V20v0.042l9.173,7.757c0.452,0.924,2.376,4.841,3.076,5.965c0.722,1.169,1.358,2.081,2.406,2.307c0.156,0.033,0.311,0.049,0.464,0.049c0.811,0,1.563-0.429,2.151-0.826c0.499-0.335,1.167-0.812,1.891-1.329c1.086-0.774,2.315-1.653,3.243-2.239c0.233-0.146,0.674-0.265,0.927,0.012c0.68,0.729,3.832,3.844,3.966,3.977c0.394,0.388,1.025,0.383,1.415-0.009C40.1,35.311,40.096,34.678,39.703,34.289z"/></svg>
\ No newline at end of file
diff --git a/app/assets/javascripts/datepicker.js b/app/assets/javascripts/datepicker.js
new file mode 100644
index 000000000..29778c169
--- /dev/null
+++ b/app/assets/javascripts/datepicker.js
@@ -0,0 +1,3 @@
+$(document).ready(function() {
+  $('.add-datepicker').datepicker({'format': 'yyyy-mm-dd'});
+});
diff --git a/app/assets/javascripts/editable.js b/app/assets/javascripts/editable.js
new file mode 100644
index 000000000..e28846cd1
--- /dev/null
+++ b/app/assets/javascripts/editable.js
@@ -0,0 +1,6 @@
+$(document).ready(function() {
+  $('.editable').click(function() {
+    $(this.dataset.form).show();
+    $(this.dataset.display).hide();
+  });
+});
diff --git a/app/assets/javascripts/plantings.js.coffee b/app/assets/javascripts/plantings.js.coffee
deleted file mode 100644
index ab5b73462..000000000
--- a/app/assets/javascripts/plantings.js.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
-
-jQuery ->
-  $('.add-datepicker').datepicker('format' : 'yyyy-mm-dd')
diff --git a/app/assets/javascripts/seeds.js.coffee b/app/assets/javascripts/seeds.js.coffee
deleted file mode 100644
index ab5b73462..000000000
--- a/app/assets/javascripts/seeds.js.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
-
-jQuery ->
-  $('.add-datepicker').datepicker('format' : 'yyyy-mm-dd')
diff --git a/app/assets/stylesheets/_crops.scss b/app/assets/stylesheets/_crops.scss
index 2d72137b9..4649812df 100644
--- a/app/assets/stylesheets/_crops.scss
+++ b/app/assets/stylesheets/_crops.scss
@@ -7,7 +7,7 @@
     bottom: 0;
     color: $white;
     margin: 0;
-    opacity: .9;
+    opacity: .8;
     position: absolute;
     text-align: center;
     width: 100%;
@@ -15,12 +15,16 @@
     h3 {
       background-color: $brown;
       font-size: 1em;
+      margin-bottom: 0;
+      padding-bottom: 0;
     }
 
     h5.crop-sci-name {
       background-color: $beige;
       color: $black;
       font-size: .7em;
+      margin-top: 0;
+      padding-top: 0;
     }
 
     a {
@@ -33,6 +37,7 @@
 
     .img-card {
       border: 5%;
+      border-radius: 5%;
     }
   }
 }
@@ -42,7 +47,6 @@
     height: 100%;
     margin: .1em;
     min-height: 300px;
-    width: 100px;
   }
 
   .img-thumbnail {
@@ -71,28 +75,18 @@
 }
 
 .crop-chip {
-  background-color: lighten($green, 20%);
-  border-radius: 25px;
-  display: inline-block;
-  font-size: 1em;
-  height: 30px;
-  line-height: 30px;
-  margin: .2em;
-  padding: 0 25px;
-
-  a {
-    color: $white;
-  }
-
-  img {
-    border-radius: 50%;
-    float: left;
-    height: 30px;
-    margin: 0 10px 0 -25px;
-    width: 30px;
-  }
+  background-color: lighten($brown, 20%);
 }
 
 .crop-hero-photo {
   max-height: 300px;
 }
+
+@include media-breakpoint-down(xs) {
+  .index-cards {
+    .crop-thumbnail {
+      margin: .2em;
+      width: 30%;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/_harvests.scss b/app/assets/stylesheets/_harvests.scss
index e69de29bb..560983965 100644
--- a/app/assets/stylesheets/_harvests.scss
+++ b/app/assets/stylesheets/_harvests.scss
@@ -0,0 +1,34 @@
+.harvest-thumbnail {
+  .text {
+    color: $white;
+    margin: 0;
+    opacity: .9;
+    position: absolute;
+    text-align: center;
+    top: 50%;
+    width: 100%;
+
+    h3 {
+      background-color: $green;
+      font-size: 1em;
+    }
+
+    h5 {
+      background-color: $brown;
+      color: $white;
+      font-size: .7em;
+    }
+
+    a {
+      color: $white;
+    }
+
+    a:hover {
+      color: $black;
+    }
+
+    .img-card {
+      border: 5%;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/_members.scss b/app/assets/stylesheets/_members.scss
index 1ab725311..188b4a317 100644
--- a/app/assets/stylesheets/_members.scss
+++ b/app/assets/stylesheets/_members.scss
@@ -19,25 +19,10 @@
 
 .member-chip {
   background-color: lighten($green, 30%);
-  border-radius: 25px;
-  display: inline-block;
-  font-size: .8em;
-  height: 30px;
-  line-height: 30px;
-  padding: 0 25px;
-  white-space: nowrap;
 
   a {
     color: $black;
   }
-
-  img {
-    border-radius: 50%;
-    float: left;
-    height: 30px;
-    margin: 0 10px 0 -25px;
-    width: 30px;
-  }
 }
 
 .member-location {
diff --git a/app/assets/stylesheets/_seeds.scss b/app/assets/stylesheets/_seeds.scss
index e69de29bb..e875832ff 100644
--- a/app/assets/stylesheets/_seeds.scss
+++ b/app/assets/stylesheets/_seeds.scss
@@ -0,0 +1,10 @@
+.seed-card {
+  .text {
+    color: $white;
+    margin: 0;
+    position: absolute;
+    text-align: center;
+    top: 1em;
+    width: 100%;
+  }
+}
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
index 5d9bdda5b..0f46481a7 100644
--- a/app/assets/stylesheets/_variables.scss
+++ b/app/assets/stylesheets/_variables.scss
@@ -14,7 +14,8 @@ $white: #fff;
 $body-bg: $beige;
 $text-color: $brown;
 $link-color: $green;
-$graph-hover: $orange;
+
+$default-font: "Fira Sans", Helvetica, Arial, sans-serif;
 
 $primary: (
   color: $green,
diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index df44ca6e8..f9d965fec 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -5,7 +5,7 @@ body {
 
 body {
   background-color: $beige;
-  font-family: $font-family-sans-serif;
+  font-family: $default-font;
 }
 
 .ellipsis {
@@ -29,7 +29,7 @@ a:hover {
 }
 
 h1 {
-  font-size: 180%;
+  font-size: 250%;
 }
 
 h2 {
@@ -59,6 +59,7 @@ section {
 
   h2 {
     background-color: $green;
+    box-shadow: 1px 1px 1px 1px darken($beige, 20%);
     color: $white;
     padding: .2em;
 
@@ -68,7 +69,11 @@ section {
   }
 
   .btn {
-    border: 1px solid $green;
+    border: 1px solid $brown;
+  }
+
+  .card {
+    box-shadow: 1px 3px 3px 1px darken($beige, 20%);
   }
 }
 
@@ -84,7 +89,6 @@ section {
 
   .card {
     background: $white;
-    // border: 1px solid lighten($brown, 20%);
     border-radius: 5%;
     margin: .5em .5em .5em 0;
     width: 200px;
@@ -94,6 +98,12 @@ section {
       border-top-right-radius: 5%;
     }
   }
+  .card-finished {
+    background: darken($beige, 10%);
+    a {
+      color: $brown;
+    }
+  }
 
   .card:hover {
     background-color: $beige;
@@ -104,7 +114,7 @@ section {
   margin-bottom: 1em;
 
   .img-card {
-    height: 180px;
+    height: 200px;
     object-fit: cover;
     width: 100%;
   }
@@ -143,6 +153,17 @@ section {
   }
 }
 
+img.img-cute {
+  bottom: -6px;
+  left: 45px;
+  position: relative;
+  width: 3em;
+}
+
+img.img-tiny {
+  width: 50px;
+}
+
 img.img-icon {
   width: 1.2em;
 }
@@ -158,16 +179,8 @@ img.avatar {
   z-index: 2;
 }
 
-.progress {
-  border-radius: 0;
-  height: 2em;
-  .progress-bar {
-    height: 2em;
-    background-color: $progress-bar-color
-  }
-  .progress-bar-text {
-    text-align: center;
-  }
+.progress-bar {
+  border-bottom: 1em solid $progress-bar-color;
 }
 
 ul.associations {
@@ -312,6 +325,29 @@ ul.thumbnail-buttons {
   background-color: $beige;
 }
 
+.chip {
+  background-color: lighten($brown, 20%);
+  border-radius: 25px;
+  color: $white;
+  display: inline-block;
+  height: 30px;
+  line-height: 30px;
+  margin: .2em;
+  padding: 0 25px;
+
+  a {
+    color: $white;
+  }
+
+  img {
+    border-radius: 50%;
+    float: left;
+    height: 30px;
+    margin: 0 10px 0 -25px;
+    width: 30px;
+  }
+}
+
 // Overrides applying only to mobile view. This must be at the end of the overrides file.
 // Extra small devices (portrait phones, less than 576px)
 @include media-breakpoint-down(xs) {
@@ -371,7 +407,7 @@ ul.thumbnail-buttons {
   .index-cards {
     .card {
       margin: .2em;
-      width: 45%;
+      width: 48%;
 
       // Shrink title to fit more on page
       .card-title {
diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index 65a559423..4d563ca4c 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -113,7 +113,10 @@ class CropsController < ApplicationController
       recreate_names('alt_name', 'alternate')
       recreate_names('sci_name', 'scientific')
 
-      notifier.deliver_now! if @crop.approval_status_changed?(from: "pending", to: "approved")
+      if @crop.approval_status_changed?(from: "pending", to: "approved")
+        notifier.deliver_now!
+        @crop.update_openfarm_data!
+      end
     else
       @crop.approval_status = @crop.approval_status_was
     end
@@ -210,7 +213,7 @@ class CropsController < ApplicationController
     q = Crop.approved.includes(:scientific_names, plantings: :photos)
     q = q.popular unless @sort == 'alpha'
     q.order(Arel.sql("LOWER(crops.name)"))
-      .includes(:photos).paginate(page: params[:page], per_page: 30)
+      .includes(:photos).paginate(page: params[:page])
   end
 
   def requested_crops
diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index f9037923a..4fff56da5 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -5,20 +5,17 @@ class GardensController < ApplicationController
   responders :flash
   respond_to :html, :json
 
-  # GET /gardens
-  # GET /gardens.json
   def index
     @owner = Member.find_by(slug: params[:member_slug])
     @show_all = params[:all] == '1'
 
     @gardens = @gardens.active unless @show_all
     @gardens = @gardens.where(owner: @owner) if @owner.present?
-    @gardens = @gardens.joins(:owner).order(:name).paginate(page: params[:page])
+    @gardens = @gardens.where.not(members: { confirmed_at: nil })
+      .order(:name).paginate(page: params[:page])
     respond_with(@gardens)
   end
 
-  # GET /gardens/1
-  # GET /gardens/1.json
   def show
     @current_plantings = @garden.plantings.current
       .includes(:crop, :owner)
@@ -29,35 +26,26 @@ class GardensController < ApplicationController
     respond_with(@garden)
   end
 
-  # GET /gardens/new
-  # GET /gardens/new.json
   def new
     @garden = Garden.new
     respond_with(@garden)
   end
 
-  # GET /gardens/1/edit
   def edit
     respond_with(@garden)
   end
 
-  # POST /gardens
-  # POST /gardens.json
   def create
     @garden.owner_id = current_member.id
     flash[:notice] = I18n.t('gardens.created') if @garden.save
     respond_with(@garden)
   end
 
-  # PUT /gardens/1
-  # PUT /gardens/1.json
   def update
     flash[:notice] = I18n.t('gardens.updated') if @garden.update(garden_params)
     respond_with(@garden)
   end
 
-  # DELETE /gardens/1
-  # DELETE /gardens/1.json
   def destroy
     @garden.destroy
     flash[:notice] = I18n.t('gardens.deleted')
diff --git a/app/controllers/harvests_controller.rb b/app/controllers/harvests_controller.rb
index f1c98fe86..353e338d6 100644
--- a/app/controllers/harvests_controller.rb
+++ b/app/controllers/harvests_controller.rb
@@ -43,7 +43,11 @@ class HarvestsController < ApplicationController
     @harvest.crop_id = @harvest.planting.crop_id if @harvest.planting_id
     @harvest.harvested_at = Time.zone.now if @harvest.harvested_at.blank?
     @harvest.save
-    respond_with(@harvest)
+    if params[:return] == 'planting'
+      respond_with(@harvest, location: @harvest.planting)
+    else
+      respond_with(@harvest)
+    end
   end
 
   def update
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 1bbbefc93..09004b823 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -61,6 +61,7 @@ class PlantingsController < ApplicationController
 
   def create
     @planting = Planting.new(planting_params)
+    @planting.planted_at = Time.zone.now if @planting.planted_at.blank?
     @planting.owner = current_member
     @planting.crop = @planting.parent_seed.crop if @planting.parent_seed.present?
     @planting.save
diff --git a/app/controllers/seeds_controller.rb b/app/controllers/seeds_controller.rb
index 1989db825..207b8d639 100644
--- a/app/controllers/seeds_controller.rb
+++ b/app/controllers/seeds_controller.rb
@@ -6,19 +6,15 @@ class SeedsController < ApplicationController
   respond_to :csv, only: :index
   respond_to :rss, only: :index
 
-  # GET /seeds
-  # GET /seeds.json
   def index
     @owner = Member.find_by(slug: params[:member_slug]) if params[:member_slug].present?
     @crop = Crop.find_by(slug: params[:crop_slug]) if params[:crop_slug].present?
     @planting = Planting.find_by(slug: params[:planting_id]) if params[:planting_id].present?
 
-    @seeds = @seeds.where(owner: @owner) if @owner.present?
-    @seeds = @seeds.where(crop: @crop) if @crop.present?
-    @seeds = @seeds.where(parent_planting: @planting) if @planting.present?
-    @seeds = @seeds.order(created_at: :desc).includes(:owner, :crop).paginate(page: params[:page])
+    @show_all = (params[:all] == '1')
 
     @filename = csv_filename
+    @seeds = seeds.order(created_at: :desc).includes(:owner, :crop).paginate(page: params[:page])
 
     respond_with(@seeds)
   end
@@ -46,7 +42,11 @@ class SeedsController < ApplicationController
     @seed.owner = current_member
     @seed.crop = @seed.parent_planting.crop if @seed.parent_planting
     flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
-    respond_with(@seed)
+    if params[:return] == 'planting'
+      respond_with(@seed, location: @seed.parent_planting)
+    else
+      respond_with(@seed)
+    end
   end
 
   def update
@@ -61,6 +61,15 @@ class SeedsController < ApplicationController
 
   private
 
+  def seeds
+    records = Seed.all
+    records = records.where(owner: @owner) if @owner.present?
+    records = records.where(crop: @crop) if @crop.present?
+    records = records.where(parent_planting: @planting) if @planting.present?
+    records = records.active unless @show_all
+    records
+  end
+
   def seed_params
     params.require(:seed).permit(
       :crop_id, :description, :quantity, :plant_before,
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 29f0ab05b..68ee9c7d8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -63,15 +63,15 @@ module ApplicationHelper
     pluralize(collection.size, model.model_name.to_s.downcase)
   end
 
-  def show_inactive_tickbox_path(type, owner, show_all)
+  def show_inactive_tickbox_path(type, owner: nil, show_all: false)
     all = show_all ? '' : 1
-    if owner
-      return member_plantings_path(owner, all: all) if type == 'plantings'
-      return member_gardens_path(owner, all: all) if type == 'gardens'
-    end
 
-    return plantings_path(all: all) if type == 'plantings'
-    return gardens_path(all: all) if type == 'gardens'
+    path = if owner.present?
+             public_send("member_#{type}_path", owner, all: all)
+           else
+             public_send("#{type}_path", all: all)
+           end
+    path
   end
 
   def title(type, owner, crop, planting)
diff --git a/app/helpers/buttons_helper.rb b/app/helpers/buttons_helper.rb
index cbcab26a3..05fc2798d 100644
--- a/app/helpers/buttons_helper.rb
+++ b/app/helpers/buttons_helper.rb
@@ -107,7 +107,7 @@ module ButtonsHelper
 
     link_to new_photo_path(id: model.id, type: model_type_for_photo(model)),
             class: classes do
-      photo_icon + ' ' + t('buttons.add_photo')
+      add_photo_icon + ' ' + t('buttons.add_photo')
     end
   end
 
diff --git a/app/helpers/editable_form_helper.rb b/app/helpers/editable_form_helper.rb
new file mode 100644
index 000000000..00cabebad
--- /dev/null
+++ b/app/helpers/editable_form_helper.rb
@@ -0,0 +1,6 @@
+module EditableFormHelper
+  def editable(field_type, model, field, display_field:, collection: [])
+    render 'shared/editable/form', field_type: field_type,
+      model: model, field: field, display_field: display_field, collection: collection
+  end
+end
diff --git a/app/helpers/gardens_helper.rb b/app/helpers/gardens_helper.rb
index fd406431e..1ebb589f0 100644
--- a/app/helpers/gardens_helper.rb
+++ b/app/helpers/gardens_helper.rb
@@ -9,10 +9,6 @@ module GardensHelper
     end
   end
 
-  def gardens_active_tickbox_path(owner, show_all)
-    show_inactive_tickbox_path('gardens', owner, show_all)
-  end
-
   def display_garden_name(garden)
     truncate(garden.name, length: 50, separator: ' ', omission: '... ')
   end
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index b21cf0757..d5839ed05 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -5,12 +5,20 @@ module IconsHelper
     send("#{event_model}_icon")
   end
 
+  def cute_icon
+    icons = %w(slug sprinkler bee ant hose grass rabbit slug-eating snail earth-worm insect watering-can
+               wheelbarrow cat spiderweb bug butterfly ladybird stones)
+    rand_num = rand(1..icons.size)
+    icon = icons[rand_num - 1]
+    image_tag("icons/#{icon}.svg", class: 'img img-cute', alt: icon)
+  end
+
   def timeline_icon
-    icon('far', 'calendar')
+    image_icon 'timeline'
   end
 
   def garden_icon
-    image_icon 'home'
+    image_icon 'gardens'
   end
 
   def planting_icon
@@ -34,19 +42,23 @@ module IconsHelper
   end
 
   def finished_icon
-    icon('fas', 'calendar')
+    image_icon 'finish'
   end
 
   def edit_icon
-    icon('fas', 'edit')
+    image_icon 'edit'
   end
 
   def delete_icon
-    icon('fas', 'trash-alt')
+    image_icon 'delete'
+  end
+
+  def add_photo_icon
+    image_icon 'add-photo'
   end
 
   def photo_icon
-    icon('fas', 'camera-retro')
+    image_icon 'photo'
   end
 
   def seedling_icon
@@ -84,10 +96,15 @@ module IconsHelper
   end
 
   def sunniness_icon(sunniness)
-    if sunniness.present?
-      image_tag("sunniness_#{sunniness}.png", class: 'img', alt: sunniness, width: 55)
+    case sunniness
+    when 'sun'
+      icon 'far', 'sun'
+    when 'shade'
+      icon 'fas', 'umbrella-beach'
+    when 'semi-shade'
+      icon 'fas', 'cloud-sun'
     else
-      image_tag("sunniness_not_specified.png", class: 'img', alt: 'unknown', width: 55)
+      icon 'fas', 'question'
     end
   end
 
diff --git a/app/helpers/plantings_helper.rb b/app/helpers/plantings_helper.rb
index 537ae7631..2c28eda76 100644
--- a/app/helpers/plantings_helper.rb
+++ b/app/helpers/plantings_helper.rb
@@ -29,8 +29,8 @@ module PlantingsHelper
     end
   end
 
-  def plantings_active_tickbox_path(owner, show_all)
-    show_inactive_tickbox_path('plantings', owner, show_all)
+  def weeks_from_not_to_finished(planting)
+    days_from_now_to_finished(planting) / 7
   end
 
   def days_from_now_to_finished(planting)
@@ -45,6 +45,10 @@ module PlantingsHelper
     (planting.first_harvest_predicted_at - Time.zone.today).to_i
   end
 
+  def weeks_from_now_to_first_harvest(planting)
+    days_from_now_to_first_harvest(planting) / 7
+  end
+
   def days_from_now_to_last_harvest(planting)
     return unless planting.planted_at.present? && planting.last_harvest_predicted_at.present?
 
diff --git a/app/models/concerns/predict_planting.rb b/app/models/concerns/predict_planting.rb
index 8b2961f64..052f7ed55 100644
--- a/app/models/concerns/predict_planting.rb
+++ b/app/models/concerns/predict_planting.rb
@@ -41,6 +41,10 @@ module PredictPlanting
       (Time.zone.today - planted_at).to_i if planted_at.present?
     end
 
+    def weeks_since_planted
+      days_since_planted / 7
+    end
+
     # progress
     def percentage_grown
       if finished?
diff --git a/app/models/crop.rb b/app/models/crop.rb
index a9dfabe52..d0283a2b6 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -10,7 +10,6 @@ class Crop < ApplicationRecord
   belongs_to :requester, class_name: 'Member', optional: true, inverse_of: :requested_crops
   belongs_to :parent, class_name: 'Crop', optional: true, inverse_of: :varieties
   has_many :scientific_names, dependent: :delete_all
-  accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
   has_many :alternate_names, dependent: :delete_all
   has_many :plantings, dependent: :destroy
   has_many :seeds, dependent: :destroy
@@ -24,6 +23,8 @@ class Crop < ApplicationRecord
   has_many :crop_posts, dependent: :delete_all
   has_many :posts, through: :crop_posts, dependent: :delete_all
 
+  accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
+
   ##
   ## Scopes
   scope :recent, -> { approved.order(created_at: :desc) }
@@ -95,6 +96,10 @@ class Crop < ApplicationRecord
       .count("harvests.id")
   end
 
+  def perennial?
+    perennial == true
+  end
+
   def annual?
     perennial == false
   end
diff --git a/app/models/harvest.rb b/app/models/harvest.rb
index 8a78ad4fc..36f61965f 100644
--- a/app/models/harvest.rb
+++ b/app/models/harvest.rb
@@ -111,15 +111,11 @@ class Harvest < ApplicationRecord
   end
 
   def unit_to_human
-    return "" unless quantity
+    return "" unless quantity && unit
+    return 'individual' if unit == 'individual'
+    return "#{unit} of" if quantity == 1
 
-    if unit == 'individual'
-      'individual'
-    elsif quantity == 1
-      "#{unit} of"
-    else
-      "#{unit.pluralize} of"
-    end
+    "#{unit.pluralize} of"
   end
 
   def weight_to_human
diff --git a/app/models/photo.rb b/app/models/photo.rb
index a1e7099c1..1490c33dc 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -7,8 +7,8 @@ class Photo < ApplicationRecord
   has_many :photo_associations, foreign_key: :photo_id, dependent: :delete_all, inverse_of: :photo
   has_many :crops, through: :photo_associations
 
-  validates :fullsize_url, url: true, uniqueness: true
-  validates :thumbnail_url, url: true, uniqueness: true
+  validates :fullsize_url, url: true
+  validates :thumbnail_url, url: true
 
   # creates a relationship for each assignee type
   PHOTO_CAPABLE.each do |type|
diff --git a/app/models/planting.rb b/app/models/planting.rb
index 0555e4ac5..868f36735 100644
--- a/app/models/planting.rb
+++ b/app/models/planting.rb
@@ -33,6 +33,8 @@ class Planting < ApplicationRecord
   ##
   ## Scopes
   scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
+  scope :annual, -> { joins(:crop).where(crops: { perennial: false }) }
+  scope :perennial, -> { joins(:crop).where(crops: { perennial: true }) }
   scope :interesting, -> { has_photos.one_per_owner.order(planted_at: :desc) }
   scope :recent, -> { order(created_at: :desc) }
   scope :one_per_owner, lambda {
diff --git a/app/models/seed.rb b/app/models/seed.rb
index 8e0544b52..32c0ef6a5 100644
--- a/app/models/seed.rb
+++ b/app/models/seed.rb
@@ -53,7 +53,7 @@ class Seed < ApplicationRecord
   scope :interesting, -> { tradable.has_location }
   scope :has_location, -> { joins(:owner).where.not("members.location": nil) }
   scope :recent, -> { order(created_at: :desc) }
-  scope :active, -> { where('finished_at < ?', Time.zone.now) }
+  scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
 
   def tradable?
     tradable_to != 'nowhere'
diff --git a/app/views/crops/_actions.html.haml b/app/views/crops/_actions.html.haml
index 1fd159662..835edea1c 100644
--- a/app/views/crops/_actions.html.haml
+++ b/app/views/crops/_actions.html.haml
@@ -1,16 +1,22 @@
-- if @crop.approved? && signed_in?
-  .nav.crop-actions
-    - if can? :create, Planting
-      = link_to new_planting_path(crop_id: crop.id), class: 'list-group-item btn' do
-        = planting_icon
-        = t('buttons.plant_crop', crop_name: crop.name)
-
-    - if can? :create, Harvest
-      = link_to new_harvest_path(crop_id: crop.id), class: 'list-group-item btn' do
-        = harvest_icon
-        = t('buttons.harvest_crop', crop_name: crop.name)
-
-    - if can? :create, Seed
-      = link_to new_seed_path(crop_id: crop.id), class: 'list-group-item btn' do
-        = seed_icon
-        = t('buttons.add_seed_to_stash', crop_name: crop.name)
+- if crop.approved? && signed_in?
+  %ul.nav.crop-actions
+    %li.nav-item.dropdown.btn.btn-sm
+      %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'} Add to garden
+      .dropdown-menu.dropdown-secondary
+        - current_member.gardens.active.each do |garden|
+          = link_to plantings_path(planting: {crop_id: crop.id, garden_id: garden.id}), method: :post, class: 'dropdown-item' do
+            = garden.name
+        .dropdown-divider
+        = link_to 'add new garden', new_garden_path, class: 'dropdown-item'
+    %li.nav-item.dropdown.btn.btn-sm
+      %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'} Record harvest
+      .dropdown-menu.dropdown-secondary
+        - PlantPart.all.each do |plant_part|
+          = link_to harvests_path(harvest: {crop_id: crop.id, plant_part_id: plant_part.id}), method: :post, class: 'dropdown-item' do
+            = plant_part.name
+    %li.nav-item.dropdown.btn.btn-sm
+      %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'}=t('buttons.save_seeds', crop_name: crop.name)
+      .dropdown-menu.dropdown-secondary
+        - Seed::TRADABLE_TO_VALUES.each do |trade|
+          = link_to seeds_path(seed: {crop_id: crop.id, tradable_to: trade}), method: :post, class: 'dropdown-item' do
+            Will trade: #{trade}
diff --git a/app/views/crops/_form.html.haml b/app/views/crops/_form.html.haml
index a0f981959..2ef58f243 100644
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -41,6 +41,8 @@
         = f.radio_button(:perennial, true, label: "Perennial")
         %span.help-block Living more than two years
 
+      - unless @crop.approved?
+        = link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
       = f.text_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
       %span.help-block
         Link to the crop's page on the English language Wikipedia (required).
diff --git a/app/views/crops/_hierarchy.html.haml b/app/views/crops/_hierarchy.html.haml
index 989c5145b..2e8af76c3 100644
--- a/app/views/crops/_hierarchy.html.haml
+++ b/app/views/crops/_hierarchy.html.haml
@@ -5,6 +5,8 @@
   - display_crops.each do |c|
     %li.crop-hierarchy{ class: (max != 0 && @count >= max) || !c.approved? ? ['hide', 'toggle'] : [] }
       = render 'crops/tiny', crop: c
+      - if c.perennial
+        = perennial_icon
       - @count += 1
       - if c.varieties.present?
         - c.varieties.order(:name).each do |v|
diff --git a/app/views/crops/_info.haml b/app/views/crops/_info.haml
index efaf693cc..2e4266dc6 100644
--- a/app/views/crops/_info.haml
+++ b/app/views/crops/_info.haml
@@ -1,15 +1,18 @@
 .row
   .col-md-9
-    %h1
+    %h1.display-3
       = crop_icon(@crop)
       %strong= @crop.name.titleize
       - unless @crop.approved?
         %badge.badge-warning=@crop.approval_status
       %small.text-muted= @crop.default_scientific_name
     - if @crop.sowing_method.present?
-      %h2= @crop.sowing_method
+      %h2
+        How to sow #{@crop.name}:
+        = @crop.sowing_method
     - if @crop.sun_requirements.present?
       %p
+        %strong Sun requirement for #{@crop}:
         Plant in #{@crop.sun_requirements}
     %p.text-muted
       - if !@crop.plantings.empty?
diff --git a/app/views/crops/_posts.html.haml b/app/views/crops/_posts.html.haml
index 1fcfea2fc..1ce1bc7ff 100644
--- a/app/views/crops/_posts.html.haml
+++ b/app/views/crops/_posts.html.haml
@@ -12,11 +12,11 @@
               locals: { to: "post your tips and experiences growing #{crop.name.pluralize}" }
 - else
 
-  = render 'layouts/pagination', collection: @posts
+  = will_paginate @posts
 
   .index-cards
     - @posts.each do |post|
       = render 'posts/preview', post: post
 
-  = render 'layouts/pagination', collection: @posts
+  = will_paginate @posts
 
diff --git a/app/views/crops/_predictions.html.haml b/app/views/crops/_predictions.html.haml
index 02e3bbacc..456756fe4 100644
--- a/app/views/crops/_predictions.html.haml
+++ b/app/views/crops/_predictions.html.haml
@@ -6,19 +6,23 @@
     .card.fact-card
       .card-body.text-center
         %h3
-          = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
-            - if crop.perennial == true
+          = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution', class: 'crop-longevity' do
+            - if crop.perennial?
               Perennial
-            - elsif crop.perennial == false
+            - elsif crop.annual?
               Annual
-
-        %strong
+        %strong.crop-longevity
           %i.far.fa-calendar
 
         - if crop.perennial == true
           %small living more than two years
         - elsif crop.perennial == false
           %small living and reproducing in a single year or less
+        - if can? :wrangle, @crop
+          %small.edit-link
+            = bootstrap_form_for(@crop) do |f|
+              = f.hidden_field :perennial, value: crop.annual?
+              = f.submit :toggle
 
   - if crop.annual? && crop.median_lifespan.present?
     .card.fact-card
@@ -28,7 +32,6 @@
         %i.fas.fa-sun-o.fa-5x.pt-3.amber-text
         %span days
 
-
   - if crop.median_days_to_first_harvest.present?
     .card.fact-card
       .card-body.text-center
diff --git a/app/views/crops/_tiny.html.haml b/app/views/crops/_tiny.html.haml
index 8b948a9cc..512379059 100644
--- a/app/views/crops/_tiny.html.haml
+++ b/app/views/crops/_tiny.html.haml
@@ -1,7 +1,7 @@
 - if crop.approved? || can?(:wrangle, Crop)
-  .crop-chip
-    = link_to crop do
+  = link_to crop do
+    %span.chip.crop-chip
       = crop_icon(crop)
       = crop.name
-    - unless crop.approved?
-      %badge.badge-warning= crop.approval_status
+      - unless crop.approved?
+        %badge.badge-warning= crop.approval_status
diff --git a/app/views/crops/index.html.haml b/app/views/crops/index.html.haml
index 07e0d37b7..7fc088750 100644
--- a/app/views/crops/index.html.haml
+++ b/app/views/crops/index.html.haml
@@ -9,29 +9,23 @@
 - content_for :breadcrumbs do
   %li.breadcrumb-item.active= link_to 'Crops', crops_path
 
-%h1=t('.title')
-%p
-  #{ENV['GROWSTUFF_SITE_NAME']} tracks who's growing what, where.
-  View any crop page to see which of our members have planted it and find
-  information on how to grow it yourself.
-
-
 = bootstrap_form_tag(url: crops_path, method: :get, layout: :inline) do |f|
-  = f.select "sort",
-               options_for_select({ "popularity": 'popular',
-                                    "alphabetically": 'alpha' },
-                                    @sort || 'popular'),
-               label: 'Sort by'
-  = f.submit "Show"
+  .input-group
+    = f.select "sort",
+                 options_for_select({ "popularity": 'popular',
+                                      "alphabetically": 'alpha' },
+                                      @sort || 'popular'),
+                 label: 'Sort by'
+    = f.submit "Show"
 
-= render 'layouts/pagination', collection: @crops
-
-.crops
+%section.crops
+  %h2= t('.title')
+  = will_paginate @crops
   .index-cards
     - @crops.each do |crop|
       = render 'crops/thumbnail', crop: crop
 
-= render 'layouts/pagination', collection: @crops
+  = will_paginate @crops
 
 %ul.list-inline
   %li The data on this page is available in the following formats:
diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index bb4a25287..cc9b680fe 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -17,34 +17,38 @@
 .jumbotron= render 'crops/info'
 
 .row
-  .col-md-9
-    %p= render 'crops/actions', crop: @crop
-  .col-md-3
-    = render 'wrangle', crop: @crop
+  .col-md-9= render 'crops/actions', crop: @crop
+  .col-md-3= render 'wrangle', crop: @crop
 .row
   .col-md-9
-    %section.prediction= render 'predictions', crop: @crop
+    %section.prediction
+      = cute_icon
+      = render 'predictions', crop: @crop
     - if @crop.companions.any?
       %section.companions
         %h2 Companions
         - @crop.companions.each do |companion|
           = render 'crops/tiny', crop: companion
 
-    %section.photos= render 'crops/photos', photos: @photos, crop: @crop
+    %section.photos
+      = cute_icon
+      = render 'crops/photos', photos: @photos, crop: @crop
 
     - if @crop.plantings.any?
-      .card-deck.text-center
-        .col-md-4
-          %h3.section-heading.h3.pt-4 Sunniness
-          = pie_chart crop_sunniness_path(@crop, format: :json), legend: "bottom"
-        .col-md-4
-          %h3.section-heading.h3.pt-4 Planted from
-          = pie_chart crop_planted_from_path(@crop, format: :json), legend: "bottom"
-        .col-md-4
-          %h3.section-heading.h3.pt-4 Harvested for
-          = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
+      %section.charts
+        .row
+          .col-lg-4.col-12
+            %h2 Sunniness
+            = pie_chart crop_sunniness_path(@crop, format: :json), legend: "bottom"
+          .col-lg-4.col-12
+            %h2 Planted from
+            = pie_chart crop_planted_from_path(@crop, format: :json), legend: "bottom"
+          .col-lg-4.col-12
+            %h2 Harvested for
+            = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
 
-    %section.varieties= render 'varieties', crop: @crop
+    %section.varieties
+      = render 'varieties', crop: @crop
 
     %section.crop-map
       %h2
@@ -59,6 +63,7 @@
     %section.posts= render 'crops/posts', crop: @crop
 
   .col-md-3
+    = cute_icon
     .card
       .card-body
         %h4 How to grow #{@crop.name.pluralize}
@@ -101,6 +106,7 @@
     = render 'harvests', crop: @crop
     = render 'find_seeds', crop: @crop
 
+    = cute_icon
     .card
       .card-body
         %h5.card-title Learn more about #{@crop.name.pluralize}
diff --git a/app/views/gardens/index.html.haml b/app/views/gardens/index.html.haml
index ce0d67833..d4fba0eae 100644
--- a/app/views/gardens/index.html.haml
+++ b/app/views/gardens/index.html.haml
@@ -13,7 +13,7 @@
     %li.breadcrumb-item.active= link_to 'Gardens', gardens_path
 
 %section.border-top
-  = link_to gardens_active_tickbox_path(@owner, @show_all), class: 'btn'  do
+  = link_to show_inactive_tickbox_path('gardens', owner: @owner, show_all: @show_all), class: 'btn'  do
     = check_box_tag 'active', 'all', @show_all
     include in-active
 
@@ -25,17 +25,31 @@
 - else
   = page_entries_info @gardens
   = will_paginate @gardens
-  - @gardens.each do |garden|
-    %section
-      %h2
-        = link_to garden.name, garden
-      = render 'gardens/actions', garden: garden
-      - if garden.plantings.any?
-        .index-cards
-          - garden.plantings.active.each do |planting|
-            = render planting, full: true
-      - else
-        No plantings
+  .row
+    - @gardens.each do |garden|
+      .col-md-6.col-12
+        %section.card
+          %h2= link_to garden.name, garden
+          .card-header
+            .row
+              - unless @owner.present?
+                .col
+                  owner:
+                  = render 'members/tiny', member: garden.owner
+              .col= render 'gardens/actions', garden: garden
+              .col
+                - if garden.plantings.any?
+                  - if garden.plantings.active.perennial.any?
+                    %strong Perennials:
+                    - garden.plantings.active.perennial.each do |planting|
+                      = link_to planting do
+                        = crop_icon planting.crop
+                        = planting.crop
+          .card-body
+            - if garden.plantings.active.annual.any?
+              = render 'plantings/progress_list', plantings: garden.plantings.active.annual
+            - else
+              No annual plantings
 
   .row
     .col-12= page_entries_info @gardens
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index 9384e088a..8c0aa69d3 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -10,20 +10,16 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
-- content_for :scripts do
-  = javascript_include_tag "charts"
-  = javascript_include_tag "https://www.gstatic.com/charts/loader.js"
-
-
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Gardens', gardens_path
   %li.breadcrumb-item.active= link_to @garden.name, gardens_path(@garden)
 
 .row
-  .col-md-9.col-sm-12
+  .col-md-9.col-12
     %h2.h1
       %strong= @garden
-      = render 'gardens/actions', garden: @garden
+  .col-md-3.col-12
+    = render 'gardens/actions', garden: @garden
 .row
   .col-md-9
     - unless @garden.active
@@ -32,7 +28,6 @@
         - if can? :edit, @garden
           = link_to 'Set it to active', edit_garden_path(@garden)
           to plant something in this garden.
-
     %div
       %p
         :growstuff_markdown
@@ -47,11 +42,10 @@
                 = link_to 'tell us more.', edit_garden_path(@garden)
 
     - if @garden.plantings.where.not(planted_at: nil).any?
-      .row
-        .col-md-12
-          %section
-            %h2 Garden timeline
-            = timeline garden_timeline_path(@garden), adapter: "google"
+      %section.card
+        %h2 Garden progress
+        .card-body
+          = render 'plantings/progress_list', plantings: @garden.plantings.active
 
     %section
       %h2 Current plantings in garden
@@ -67,7 +61,7 @@
       .index-cards
         - if @finished_plantings.size.positive?
           - @finished_plantings.each do |planting|
-            = render "plantings/thumbnail",  planting: planting
+            = render "plantings/tiny",  planting: planting
         - else
           .col-md-12
             %p Nothing has been planted here.
diff --git a/app/views/harvests/_card.html.haml b/app/views/harvests/_card.html.haml
index 51d077338..53ddcc3d0 100644
--- a/app/views/harvests/_card.html.haml
+++ b/app/views/harvests/_card.html.haml
@@ -6,7 +6,7 @@
       = crop_icon(harvest.crop)
       %strong
         = link_to harvest.crop, harvest
-      %span.badge.badge-pill= link_to harvest.plant_part, harvest.plant_part
+      %span.badge.badge-pill= harvest.plant_part
     - if harvest.planting.present?
       %p.card-text
         %small.text-muted
diff --git a/app/views/harvests/_thumbnail.html.haml b/app/views/harvests/_thumbnail.html.haml
index f29828b4f..8539d72d8 100644
--- a/app/views/harvests/_thumbnail.html.haml
+++ b/app/views/harvests/_thumbnail.html.haml
@@ -1,10 +1,9 @@
-.thumbnail
-  .harvest-thumbnail
-    - if harvest
-      = link_to image_tag(harvest_image_path(harvest),
-                          alt: harvest.crop.name, class: 'img'),
-                          harvest
-      .harvestinfo
-        .harvest-name
-          = link_to display_quantity(harvest), harvest
-  = I18n.l(harvest.harvested_at.to_date)
+.card.harvest-thumbnail
+  = link_to image_tag(harvest_image_path(harvest),
+                        alt: harvest,
+                        class: 'img img-card'),
+                        harvest
+
+  .text
+    %h3.harvest-plant-part= link_to harvest.plant_part, harvest
+    %h5.harvest-crop= harvest.crop
diff --git a/app/views/harvests/index.html.haml b/app/views/harvests/index.html.haml
index 527ce0e56..dd0ccfc29 100644
--- a/app/views/harvests/index.html.haml
+++ b/app/views/harvests/index.html.haml
@@ -29,7 +29,6 @@
   .index-cards=render @harvests, full: true
 
 .pagination
-  = page_entries_info @harvests
   = will_paginate @harvests
 
 %section.open-data
diff --git a/app/views/harvests/show.html.haml b/app/views/harvests/show.html.haml
index cc68a79bd..b5f98b55e 100644
--- a/app/views/harvests/show.html.haml
+++ b/app/views/harvests/show.html.haml
@@ -13,43 +13,55 @@
   %li.breadcrumb-item= link_to @harvest.owner, member_harvests_path(@harvest.owner)
   %li.breadcrumb-item.active= link_to @harvest, @harvest
 
-.row
-  .col-md-8
-    %h1
-      = harvest_icon
-      #{@harvest.crop} harvested by #{@harvest.owner}
-    = render 'harvests/actions', harvest: @harvest
-    = render partial: 'planting'
-    .index-cards.facts
-      - if @harvest.plant_part
+.harvest
+  .row
+    .col-md-8.col-xs-12
+      %h1
+        = harvest_icon
+        #{@harvest.crop} harvested by #{@harvest.owner}
+    .col-md-4.col-xs-12
+      = render 'harvests/actions', harvest: @harvest
+    .col-md-8.col-xs-12
+      = render partial: 'planting'
+      .index-cards.facts
+        - if @harvest.plant_part
+          .card
+            %h3
+              Plant part
+              = editable :select, @harvest, :plant_part_id, collection: PlantPart.all.pluck(:name, :id), display_field: '.harvest-plantpart'
+            %strong.harvest-plantpart= @harvest.plant_part
         .card
-          %h3 Plant part
-          %span= link_to @harvest.plant_part, @harvest.plant_part
-      - if @harvest.harvested_at.present?
+          %h3
+            Harvested
+            = editable :date, @harvest, :harvested_at, display_field: '.harvested_at'
+          %strong.harvested_at #{time_ago_in_words @harvest.harvested_at} ago
+          %span.harvested_at= I18n.l @harvest.harvested_at
+
+        .card{class: @harvest.quantity.present? ? '' : 'text-muted'}
+          %h3
+            Quantity
+            = editable :text_field, @harvest, :quantity, display_field: '.quantity'
+          %strong.quantity
+            = display_quantity(@harvest)
+
+      - if @harvest.photos.size.positive?
+        %section
+          %h2 Photos
+          = render 'photos/gallery', photos: @harvest.photos.order(date_taken: :desc).limit(3)
+      %section.harvest-detail
+        %h2 Detail
+        - if @harvest.planting.present?
+          Havested from
+          = link_to @harvest.planting, @harvest.planting
+
+      - if @harvest.description.present?
         .card
-          %h3 Harvested
-          %strong= I18n.l @harvest.harvested_at
-      .card
-        %h3 Quantity
-        %strong= display_quantity(@harvest)
-    - if @harvest.photos.size.positive?
-      %section
-        %h2 Photos
-        = render 'photos/gallery', photos: @harvest.photos.order(date_taken: :desc).limit(3)
-    %section.harvest-detail
-      %h2 Detail
-      - if @harvest.planting.present?
-        Havested from
-        = link_to @harvest.planting, @harvest.planting
+          .card-header
+            %h2 Notes
+          .card-body
+            :growstuff_markdown
+              #{strip_tags(@harvest.description)}
 
-    - if @harvest.description.present?
-      .card
-        .card-header
-          %h2 Notes
-        .card-body
-          :growstuff_markdown
-            #{strip_tags(@harvest.description)}
-
-  .col-md-4
-    = render 'harvests/owner', harvest: @harvest
-    = render @harvest.crop
+    .col-md-4.col-xs-12
+      = render 'harvests/owner', harvest: @harvest
+      = render @harvest.crop
diff --git a/app/views/home/_blurb.html.haml b/app/views/home/_blurb.html.haml
index 11582e8b6..e65a1c396 100644
--- a/app/views/home/_blurb.html.haml
+++ b/app/views/home/_blurb.html.haml
@@ -1,6 +1,6 @@
 .row
   .col-md-8.info
-    %h1.display-1= ENV['GROWSTUFF_SITE_NAME']
+    %h1.display-3= ENV['GROWSTUFF_SITE_NAME']
     %p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME'])
     = render 'stats'
   .col-md-4
diff --git a/app/views/home/_crops.html.haml b/app/views/home/_crops.html.haml
index 9a6d9d658..b463948c8 100644
--- a/app/views/home/_crops.html.haml
+++ b/app/views/home/_crops.html.haml
@@ -1,5 +1,5 @@
 - cache cache_key_for(Crop, 'homepage'), expires_in: 1.day do
   .index-cards
-    - Crop.interesting.includes(:scientific_names, :photos).shuffle.first(12).each do |crop|
+    - Crop.interesting.includes(:scientific_names, :photos).shuffle.first(18).each do |crop|
       = render 'crops/thumbnail', crop: crop
 
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 3b027c956..e5caaeab3 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -2,16 +2,23 @@
   = ENV['GROWSTUFF_SITE_NAME']
 
 - if member_signed_in?
-  %h1.display-2= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
+  .row
+    .col-lg-8.col-md-12
+      %h1.display-4= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
 
-  %p= render 'stats'
+      %p= render 'stats'
+    .col
+      %p
+        = link_to member_gardens_path(current_member), class: 'btn btn-dark' do
+          = image_icon 'gardens'
+          Show me my garden
 - else
   .hidden-xs
     %section.jumbotron= render 'blurb'
-
 .row
   .col-lg-8.col-md-12
     %section.crops
+      = cute_icon
       %h2= t('home.crops.our_crops')
       = render 'crops'
       = link_to "#{t('home.crops.view_all')} »", crops_path, class: 'btn btn-block'
@@ -23,14 +30,17 @@
 
   .col-xl-2.col
     %section.plantings
+      = cute_icon
       =render 'plantings'
       %p.text-right= link_to "#{t('home.plantings.view_all')} »", plantings_path, class: 'btn btn-block'
   .col-xl-2.col
     %section.harvests
+      = cute_icon
       = render 'harvests'
       %p.text-right= link_to "#{t('home.harvests.view_all')} »", harvests_path, class: 'btn btn-block'
   .col-12.col-md-6
     %section.seeds
+      = cute_icon
       = render 'seeds'
       %p.text-right= link_to "#{t('home.seeds.view_all')} »", seeds_path, class: 'btn btn-block'
   .col-12.col-md-6
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 9376d9a02..3783b7059 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -1,20 +1,58 @@
 %nav.navbar.navbar-expand-lg.navbar-dark.default-color.bg-dark
-  %a.navbar-brand.d-xs-none{ href: root_path }
-    = image_tag("growstuff-brand.png", size: "200x50", alt: ENV['GROWSTUFF_SITE_NAME'])
-  %a.navbar-brand.d-none.d-xs{ href: root_path }
-    = image_tag("growstuff-apple-touch-icon-precomposed.png",
-                size: "40x40", alt: ENV['GROWSTUFF_SITE_NAME'])
-  %button.navbar-toggler{"aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarSupportedContent", "data-toggle" => "collapse", type: "button"}
-    %span.navbar-toggler-icon
+  .row
+    .col-2.col-lg-4
+      .d-none.d-lg-inline
+        %a.navbar-brand{ href: root_path }
+          = image_tag("growstuff-brand.png", size: "200x50", alt: ENV['GROWSTUFF_SITE_NAME'])
+      .d-inline.d-lg-none
+        %a.navbar-brand{ href: root_path }
+          = image_tag("growstuff-apple-touch-icon-precomposed.png", size: "40x40",
+            alt: ENV['GROWSTUFF_SITE_NAME'])
+    .col-8.col-lg-7
+      = render 'crops/search_bar'
+    .col-2.col-lg-1
+      %button.navbar-toggler{"aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarSupportedContent", "data-toggle" => "collapse", type: "button"}
+        %i.fas.fa-ellipsis-v.navbar-toggler-icon
+
   #navbarSupportedContent.collapse.navbar-collapse
     %ul.navbar-nav.mr-auto
+      - if signed_in?
+        = link_to timeline_index_path, method: :get, class: 'nav-link text-white' do
+          = image_tag 'icons/notification.svg', class: 'img img-icon'
+        = link_to member_gardens_path(member_slug: current_member.slug), class: 'nav-link text-white' do
+          = image_icon 'gardens'
+        %li.nav-item.dropdown
+          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}
+            = image_tag "icons/gardener.svg", class: 'img img-icon'
+            = t('.record')
+          .dropdown-menu
+            = link_to new_planting_path, class: 'dropdown-item' do
+              = image_icon('planting-add')
+              = t('buttons.new_planting')
+            = link_to new_harvest_path, class: 'dropdown-item' do
+              = image_icon('harvest-add')
+              = t('buttons.new_harvest')
+            = link_to new_seed_path, class: 'dropdown-item' do
+              = image_icon('seed-add')
+              = t('buttons.new_seeds')
+            = link_to new_post_path, class: 'dropdown-item' do
+              = post_icon
+              = t('buttons.new_post')
+
       %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :href => "#", :role => "button"}= t('.crops')
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
         .dropdown-menu
-          = link_to t('.browse_crops'), crops_path, class: 'dropdown-item'
-          = link_to t('.seeds'), seeds_path, class: 'dropdown-item'
-          = link_to t('.plantings'), plantings_path, class: 'dropdown-item'
-          = link_to t('.harvests'), harvests_path, class: 'dropdown-item'
+          = link_to crops_path, class: 'dropdown-item' do
+            = t('.browse_crops')
+          = link_to seeds_path, class: 'dropdown-item' do
+            = seed_icon
+            = t('.seeds')
+          = link_to plantings_path, class: 'dropdown-item' do
+            = planting_icon
+            = t('.plantings')
+          = link_to harvests_path, class: 'dropdown-item' do
+            = harvest_icon
+            = t('.harvests')
 
       %li.nav-item.dropdown
         %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.community')
@@ -24,7 +62,6 @@
           = link_to t('.posts'), posts_path, class: 'dropdown-item'
           = link_to t('.forums'), forums_path, class: 'dropdown-item'
 
-
       - if member_signed_in?
         %li.nav-item.dropdown
           %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}
@@ -70,4 +107,3 @@
       - else
         %li.nav-item= link_to t('.sign_in'), new_member_session_path, id: 'navbar-signin', class: 'btn nav-link'
         %li.nav-item= link_to t('.sign_up'), new_member_registration_path, id: 'navbar-signup', class: 'btn nav-link'
-    = render 'crops/search_bar'
diff --git a/app/views/layouts/_nav.haml b/app/views/layouts/_nav.haml
index 07477f19a..7122a0e20 100644
--- a/app/views/layouts/_nav.haml
+++ b/app/views/layouts/_nav.haml
@@ -1,17 +1,15 @@
-%ul.nav
-  - if current_member.present?
-    %li.list-group-item.btn
-      = link_to url_for([current_member, model]) do
+- if current_member.present?
+  %ul.nav.crop-actions
+    %li.nav-item.dropdown.btn.btn-sm
+      = link_to url_for([current_member, model]), class: 'nav-link' do
         My #{model.model_name.human.pluralize}
+    %li.nav-item.dropdown.btn.btn-sm
+      = link_to model, class: 'nav-link' do
+        Everyone's #{model.model_name.human.pluralize}
+    - if can?(:create, model)
+      %li.nav-item.dropdown.btn.btn-sm
+        = link_to url_for([model, action: :new]), class: 'nav-link' do
+          Add a #{model.model_name.human}
 
-  %li.list-group-item.btn
-    = link_to model do
-      Everyone's #{model.model_name.human.pluralize}
-
-  - if can?(:create, model)
-    %li.list-group-item.btn
-      = link_to url_for([model, action: :new]) do
-        Add a #{model.model_name.human}
-
-- unless current_member
-  = render 'shared/signin_signup', to: "add a new #{model.to_s.downcase}"
+- else
+  = render 'shared/signin_signup', to: "record your #{model.to_s.pluralize.downcase}"
diff --git a/app/views/layouts/_pagination.html.haml b/app/views/layouts/_pagination.html.haml
deleted file mode 100644
index a57470a4b..000000000
--- a/app/views/layouts/_pagination.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= will_paginate collection
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a378fc735..72bb495c5 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -9,17 +9,14 @@
     %a{ name: 'skipnav' }
     #maincontainer.container-fluid
       .row
-        .col-12
-          .layout-actions= render 'shared/global_actions'
+        .col-md-8.col-12
           - if content_for?(:breadcrumbs)
-            .float-left
-              %nav{"aria-label" => "breadcrumb"}
-                %ol.breadcrumb
-                  %li.breadcrumb-item= link_to 'Home', root_path
-                  = yield(:breadcrumbs)
-
-          - if content_for?(:buttonbar)
-            = yield(:buttonbar)
+            %nav
+              %ol.breadcrumb{"aria-label" => "breadcrumb"}
+                %li.breadcrumb-item= link_to 'Home', root_path
+                = yield(:breadcrumbs)
+      - if content_for?(:buttonbar)
+        = yield(:buttonbar)
 
       - if content_for?(:subtitle)
         %small= yield(:subtitle)
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
new file mode 100644
index 000000000..8468a6b4c
--- /dev/null
+++ b/app/views/layouts/modal.html.haml
@@ -0,0 +1,11 @@
+#mainModal.modal{"aria-hidden" => "true", "aria-labelledby" => "mainModalLabel", role: "dialog", tabindex: "-1"}
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{"data-dismiss" => "modal", type: "button"}
+          %span{"aria-hidden" => "true"} &#215;
+          %span.sr-only Close
+        %h4#mainModalLabel.modal-title
+          = yield :title if content_for? :title
+          \&#160;
+      = yield
diff --git a/app/views/members/_tiny.haml b/app/views/members/_tiny.haml
index 4693bf373..95b51c2b0 100644
--- a/app/views/members/_tiny.haml
+++ b/app/views/members/_tiny.haml
@@ -1,4 +1,4 @@
-%span.member-chip
+%span.chip.member-chip
   - if member.discarded?
     = icon 'fas', 'user-times'
     = member
diff --git a/app/views/photos/_tiny.html.haml b/app/views/photos/_tiny.html.haml
new file mode 100644
index 000000000..3e95fb558
--- /dev/null
+++ b/app/views/photos/_tiny.html.haml
@@ -0,0 +1,3 @@
+- if photo.present?
+  .photo
+    = image_tag(photo.thumbnail_url, alt: photo.title, class: 'img img-tiny')
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 67f2da1a6..c286d8afc 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -13,11 +13,19 @@
 
 .row{id: "photo-#{@photo.id}"}
   .col-md-9
-    %h1.text-center.ellipsis
-      = photo_icon
-      = @photo.title
-    %p.text-center
-      = image_tag(@photo.fullsize_url, alt: @photo.title, class: 'rounded img-responsive shadow-sm')
+    %section.photo
+      %h2.text-center.ellipsis
+        = photo_icon
+        = @photo.title
+
+      %p.text-center
+        = image_tag(@photo.fullsize_url, alt: @photo.title, class: 'rounded img-responsive shadow-sm')
+
+
+    - if @crops.size.positive?
+      .index-cards
+        - @crops.each do |crop|
+          = render 'crops/thumbnail', crop: crop
   .col-md-3
     %p
       = render 'photos/actions', photo: @photo
@@ -26,14 +34,11 @@
           = icon 'fab', 'flickr'
         View on #{@photo.source.titleize}
       %span.btn= render 'photos/likes', photo: @photo
-
-    - if @crops.size.positive?
-      - @crops.each do |crop|
-        = render 'crops/tiny', crop: crop
-    %p
-      = render 'members/tiny', member: @photo.owner
       - if @photo.date_taken.present?
-        Taken on #{I18n.l @photo.date_taken.to_date}
+        %h3 Taken on #{I18n.l @photo.date_taken.to_date}
+
+    = render @photo.owner
+
     %p
       %strong License:
       - if @photo.license_url
diff --git a/app/views/plant_parts/index.html.haml b/app/views/plant_parts/index.html.haml
index 34846e9c3..22c4784da 100644
--- a/app/views/plant_parts/index.html.haml
+++ b/app/views/plant_parts/index.html.haml
@@ -1,21 +1,25 @@
 - content_for :title, "Plant parts"
 
+%h1 Plant Parts
+
 - if can? :create, PlantPart
-  = link_to 'New Plant part', new_plant_part_path
+  = link_to 'New Plant part', new_plant_part_path, class: 'btn btn-info'
 
-- @plant_parts.each do |plant_part|
-  %h2= plant_part
-  %p
-    - if plant_part.crops.empty?
-      No crops are harvested for this plant part (yet).
-    - else
-      - plant_part.crops.limit(100).each do |crop|
-        = link_to(crop, crop_path(crop))
-  %p
-    = link_to "More detail", plant_part
-
-  %p
-  - if can? :edit, plant_part
-    = link_to 'Edit', edit_plant_part_path(plant_part), class: 'btn btn-default btn-xs'
-  - if can? :destroy, plant_part
-    = link_to 'Delete', plant_part, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs'
+.index-cards
+  - @plant_parts.each do |plant_part|
+    .card.plant-part
+      .card-header
+        %h2= link_to plant_part, plant_part
+      .card-body
+        %p
+          - if plant_part.crops.empty?
+            No crops are harvested for this plant part (yet).
+          - else
+            - plant_part.crops.limit(20).each do |crop|
+              = render 'crops/tiny', crop: crop
+      .card-footer
+        %p
+          - if can? :edit, plant_part
+            = link_to 'Edit', edit_plant_part_path(plant_part), class: 'btn btn-default btn-xs'
+          - if can? :destroy, plant_part
+            = link_to 'Delete', plant_part, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs'
diff --git a/app/views/plantings/_badges.html.haml b/app/views/plantings/_badges.html.haml
index fd38ccb57..9d24a054e 100644
--- a/app/views/plantings/_badges.html.haml
+++ b/app/views/plantings/_badges.html.haml
@@ -7,18 +7,12 @@
         = planting_finish_button(planting)
       - elsif planting.late?
         %span.badge.badge-info.badge-late= t('.late_finishing')
-      - else
-        %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted days until planting is finished'}
-          = finished_icon
-          = t('label.days_until_finished', number: days_from_now_to_finished(planting))
 
     // Harvest times
     - unless planting.super_late?
       - if planting.harvest_time?
         %span.badge.badge-info.badge-harvest{'data-toggle': "tooltip", 'data-placement': "top", title: 'Planting is ready for harvesting now'}
-          = harvest_icon
           = t('label.harvesting_now')
       - elsif planting.before_harvest_time?
-        %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted days until harvest'}
-          = harvest_icon
-          = t('label.days_until_harvest', number: days_from_now_to_first_harvest(planting))
+        %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted weeks until harvest'}
+          = t('label.weeks_until_harvest', number: weeks_from_now_to_first_harvest(planting))
diff --git a/app/views/plantings/_card.html.haml b/app/views/plantings/_card.html.haml
index 479815afa..2f9ffc6d9 100644
--- a/app/views/plantings/_card.html.haml
+++ b/app/views/plantings/_card.html.haml
@@ -1,4 +1,4 @@
-.card.planting-card.planting
+.card.planting{class: planting.active? ? '' : 'card-finished'}
   = link_to planting do
     = image_tag planting_image_path(planting), class: 'img-card', alt: planting
   - if can? :edit, planting
@@ -17,10 +17,8 @@
           - if can? :destroy, planting
             .dropdown-divider
             = delete_button(planting, classes: 'dropdown-item text-danger')
-
-  .card-body.text-center
-    %h4.card-title= link_to planting.crop, planting
-    .text-center= render 'plantings/badges', planting: planting
-    = render 'plantings/progress', planting: planting
-  -# .card-footer
-  -#   .float-right=render 'members/tiny', member: planting.owner
\ No newline at end of file
+  = link_to planting do
+    .card-body.text-center
+      %h4= planting.crop
+      .text-center= render 'plantings/badges', planting: planting
+      = render 'plantings/progress', planting: planting
diff --git a/app/views/plantings/_descendants.html.haml b/app/views/plantings/_descendants.html.haml
index 64f93a2c8..2dd31b8d0 100644
--- a/app/views/plantings/_descendants.html.haml
+++ b/app/views/plantings/_descendants.html.haml
@@ -1,9 +1,17 @@
 %h2 Seeds saved
+
+%a.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button"}
+  = seed_icon
+  = t('buttons.save_seeds')
+.dropdown-menu.dropdown-secondary
+  - Seed::TRADABLE_TO_VALUES.each do |trade|
+    = link_to seeds_path(return: 'planting', seed: {crop_id: planting.crop.id, parent_planting_id: planting.id, tradable_to: trade}), method: :post, class: 'dropdown-item' do
+      Will trade:
+      = trade
+
 - if planting.child_seeds.size.positive?
   .index-cards
     - planting.child_seeds.each do |seed|
       = render 'seeds/card', seed: seed
 - else
   %p No seeds saved
-
-= planting_save_seeds_button(planting)
diff --git a/app/views/plantings/_facts.haml b/app/views/plantings/_facts.haml
index a6afb8122..4afd14ca7 100644
--- a/app/views/plantings/_facts.haml
+++ b/app/views/plantings/_facts.haml
@@ -7,43 +7,63 @@
           = seed_icon
       %span=planting.parent_seed
 
-  - if planting.finished?
-    .card.fact-card
+  - if planting.planted_at.present?
+    .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
       %h3 Planted
-      %strong=planting_icon
-      - if planting.quantity.present?
-        %span.plantingfact--quantity= planting.quantity
+      %strong.plantingfact--plantedmonth
+        = I18n.t('date.abbr_month_names')[planting.planted_at.month]
+      %span=planting.planted_at.year
 
-  - if planting.planted_at.present? && !planting.finished?
-    .card.fact-card
-      %h3 Planted
-      %strong.plantingfact--dayssinceplanted #{planting.days_since_planted}
-      %span days ago
-  - if planting.quantity.to_i.positive?
-    .card.fact-card
-      %h3 Quantity
-      %strong.plantingfact--quantity= planting.quantity
-      %span
-        - if planting.planted_from.present?
-          #{pluralize((planting.quantity.to_i), planting.planted_from)}
+  .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
+    %h3
+      Planted
+      = editable :date, planting, :planted_at, display_field: '.planted_at'
+    %strong.plantingfact--weekssinceplanted.planted_at
+      - if planting.planted_at.present?
+        #{planting.weeks_since_planted}
+      - else
+        unknown
+    %span.planted_at weeks ago
+    - if planting.planted_at.present?
+      %span.plantingfact--planttedat.planted_at
+        = I18n.l planting.planted_at
+
+
+
+  .card.fact-card{class: planting.quantity.present? ? '' : 'text-muted'}
+    %h3
+      Quantity
+      %small= editable :text_field, planting, :quantity, display_field: '.plantingfact--quantity'
+    %strong.plantingfact--quantity
+      - if planting.quantity.to_i.positive?
+        = planting.quantity
+      -else
+        unknown
+    %span
+      - if planting.quantity.to_i.positive? && planting.planted_from.present?
+        = planting.planted_from.pluralize(planting.quantity.to_i)
 
   - unless planting.finished?
     .card.fact-card.grid-sizer
       %h3 Growing
       %strong= seedling_icon
-      - if planting.planted_at.present?
-        %span.plantingfact--planttedat= I18n.l planting.planted_at.to_date
+      %span
+        Planting is still growing today
 
+  .card.fact-card{class: planting.planted_from.present? ? '' : 'text-muted'}
+    %h3
+      Grown from
+      = editable :select, planting, :planted_from, collection: Planting::PLANTED_FROM_VALUES, display_field: '.plantingfact--plantedfrom'
+    %strong.plantingfact--plantedfrom
+      = planting.planted_from.present? ? planting.planted_from : 'unknown'
 
-  - if planting.planted_from.present?
-    .card.fact-card
-      %h3 Grown from
-      %span.plantingfact--plantedfrom=planting.planted_from
-
-  .card.fact-card
-    %h3 Grown in
+  .card.fact-card{class: planting.sunniness.present? ? '' : 'text-muted'}
+    %h3
+      Grown in
+      = editable :select, planting, :sunniness, collection: Planting::SUNNINESS_VALUES, display_field: '.plantingfact--sunniness'
     %strong= sunniness_icon(planting.sunniness)
-    %span.plantingfact--sunniness= planting.sunniness.blank? ? "not specified" : planting.sunniness
+    %span.plantingfact--sunniness
+      = planting.sunniness.blank? ? "not specified" : planting.sunniness
 
   .card.fact-card
     %h3.plantingfact--harveststitle
@@ -51,8 +71,9 @@
     %strong
       = link_to planting_harvests_path(planting) do
         = harvest_icon
-    %span.plantingfact--harvestprediction
-      = planting.first_harvest_date&.to_formatted_s(:rfc822) || planting&.first_harvest_predicted_at&.to_formatted_s(:rfc822) || 'unknown'
+    - if planting.first_harvest_date.present? ||  planting.first_harvest_predicted_at.present?
+      %span.plantingfact--harvestprediction
+        = I18n.l(planting.first_harvest_date || planting&.first_harvest_predicted_at || 'unknown')
 
   - if planting.crop.perennial
     .card.fact-card
@@ -61,16 +82,20 @@
   - else
     - if !planting.finished? && planting.finish_is_predicatable?
       .card.fact-card
-        - days = days_from_now_to_finished(planting)
-        - if days.positive?
-          %h3.plantingfact--finishtitle Prediction
-          %strong.plantingfact--finisheddays #{days}
-          %span days until finished
+        %h3.plantingfact--finishtitle Predicted Finish
+        %strong.plantingfact--finishedmonth
+          = I18n.t('date.abbr_month_names')[planting.finish_predicted_at.month]
+        %span=planting.finish_predicted_at.year
+
+      .card.fact-card
+        %h3.plantingfact--finishtitle Predicted Finish
+        - if days_from_now_to_finished(planting).positive?
+          %strong.plantingfact--finisheddays= weeks_from_not_to_finished(planting)
+          %span weeks
         - else
-          %h3.plantingfact--finishtitle Finished
-          %strong.plantingfact--finisheddays #{days * -1}
-          %span days ago
-        %span= planting.finish_predicted_at&.to_formatted_s(:rfc822)
+          %strong.plantingfact--finisheddays #{weeks_from_not_to_finished(planting) * -1}
+          %span weeks ago
+        %span= I18n.l planting.finish_predicted_at
 
   - if planting.child_seeds.size.positive?
     .card.fact-card
@@ -84,5 +109,7 @@
     .card.fact-card
       %h3 Finished
       %strong=finished_icon
-      %span.plantingfact--finish=planting.finished_at&.to_formatted_s(:rfc822)
-
+      - if planting.finished_at.present?
+        %span.plantingfact--finish
+          = I18n.t('date.abbr_month_names')[planting.finished_at.month]
+          = planting.finished_at.year
diff --git a/app/views/plantings/_harvests.html.haml b/app/views/plantings/_harvests.html.haml
index ec3933ef1..aa3a0fd40 100644
--- a/app/views/plantings/_harvests.html.haml
+++ b/app/views/plantings/_harvests.html.haml
@@ -1,4 +1,15 @@
 %h2 Harvests
+
+- if can? :edit, @planting
+  %a.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :href => "#", :role => "button"}
+    = harvest_icon
+    Record harvest
+
+  .dropdown-menu.dropdown-secondary
+    - PlantPart.all.each do |plant_part|
+      = link_to harvests_path(return: 'planting', harvest: {crop_id: @planting.crop_id, planting_id: @planting.id, plant_part_id: plant_part.id}), method: :post, class: 'dropdown-item' do
+        = plant_part.name
+
 - if planting.harvests.empty?
   %p No harvests recorded
   - if !planting.finished? && can?(:edit, planting) && can?(:create, Harvest)
@@ -6,6 +17,4 @@
 - else
   .index-cards
     - planting.harvests.order(created_at: :desc).includes(:crop).each do |harvest|
-      = render 'harvests/card', harvest: harvest
-
-= planting_harvest_button(planting)
+      = render 'harvests/thumbnail', harvest: harvest
diff --git a/app/views/plantings/_photos.haml b/app/views/plantings/_photos.haml
index f27f2864d..800b42828 100644
--- a/app/views/plantings/_photos.haml
+++ b/app/views/plantings/_photos.haml
@@ -4,7 +4,9 @@
   - if can?(:edit, planting) && can?(:create, Photo)
     %p.text-right= add_photo_button(planting)
   %p.text-right
-    = link_to 'more photos', planting_photos_path(planting), class: 'btn'
+    = link_to planting_photos_path(planting), class: 'btn' do
+      = photo_icon
+      more photos
 - else
   %p No photos.
   - if can?(:edit, planting) && can?(:create, Photo)
diff --git a/app/views/plantings/_progress.html.haml b/app/views/plantings/_progress.html.haml
index a26fa646a..a61233f3e 100644
--- a/app/views/plantings/_progress.html.haml
+++ b/app/views/plantings/_progress.html.haml
@@ -1,8 +1,11 @@
-- if planting.annual? && planting.percentage_grown.present?
+- if planting.active? && planting.annual? && planting.percentage_grown.present?
   .progress
-    .progress-bar.bg-success{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => planting.percentage_grown, :role => "progressbar", :style => "width: #{planting.percentage_grown}%; height: 25px"}
+    .progress-bar.bg-success{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => planting.percentage_grown, role: "progressbar", style: "width: #{planting.percentage_grown}%"}
 
   .float-left #{sprintf '%.0f', planting.percentage_grown}%
 
   - unless planting.finish_predicted_at.blank?
-    .float-right= planting.finish_predicted_at.strftime(Date::DATE_FORMATS[:ymd])
+    .float-right
+      -# = planting.finish_predicted_at.strftime(Date::DATE_FORMATS[:ymd])
+      = I18n.t('date.abbr_month_names')[planting.finish_predicted_at.month]
+      = planting.finish_predicted_at.year
diff --git a/app/views/plantings/_progress_list.haml b/app/views/plantings/_progress_list.haml
new file mode 100644
index 000000000..79e9f0246
--- /dev/null
+++ b/app/views/plantings/_progress_list.haml
@@ -0,0 +1,15 @@
+- plantings.includes(:crop).annual.order("crops.name").each_with_index do |planting, i|
+  - if i.positive?
+    %hr/
+  .row.progress-row
+    .col-6.col-md-4.progress-row--crop
+      = render 'plantings/tiny', planting: planting
+      = render 'plantings/badges', planting: planting
+    .col-6.col-md-6.progress-row--bar
+      - if planting.planted_at.blank?
+        %small set "planted" date to allow predictions
+      - elsif planting.percentage_grown.blank?
+        %small not enough data on #{planting.crop} to predict
+      - else
+        = render 'plantings/progress', planting: planting
+    .col-12.col-md-2= render 'plantings/quick_actions', planting: planting
diff --git a/app/views/plantings/_quick_actions.haml b/app/views/plantings/_quick_actions.haml
index a2e4c6fac..61d173ef2 100644
--- a/app/views/plantings/_quick_actions.haml
+++ b/app/views/plantings/_quick_actions.haml
@@ -1,16 +1,14 @@
 - if can?(:edit, planting)
-  .planting-quick-actions.text-right
-    %a.btn#actionsMenu.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#"}
-      -# =icon('fas', 'ellipsis-v')
-    %ul.dropdown-menu.dropdown-menu-left{"aria-labelledby" => "actionsMenu"}
-      %li.btn-xs
-        = link_to t('view'), planting, class: 'btn'
-      %li.btn-xs= planting_edit_button(planting)
-      %li.btn-xs= add_photo_button(planting)
+  %a#planting-actions-menu.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#"}
+    /=icon('fas', 'ellipsis-v')
+  %ul.dropdown-menu.dropdown-menu-left{"aria-labelledby" => "planting-actions-menu"}
+    %li= link_to t('view'), planting, class: 'dropdown-item'
+    %li= planting_edit_button(planting, classes: 'dropdown-item')
+    %li= add_photo_button(planting, classes: 'dropdown-item')
 
-      - if planting.active?
-        %li.btn-xs= planting_finish_button(planting)
-        %li.btn-xs= planting_harvest_button(planting)
-        %li.btn-xs= planting_save_seeds_button(planting)
+    - if planting.active?
+      %li= planting_finish_button(planting, classes: 'dropdown-item')
+      %li= planting_harvest_button(planting, classes: 'dropdown-item')
+      %li= planting_save_seeds_button(planting, classes: 'dropdown-item')
 
 
diff --git a/app/views/plantings/_tiny.html.haml b/app/views/plantings/_tiny.html.haml
new file mode 100644
index 000000000..ccffd765a
--- /dev/null
+++ b/app/views/plantings/_tiny.html.haml
@@ -0,0 +1,4 @@
+= link_to planting do
+  .chip.crop-chip
+    = crop_icon(planting.crop)
+    = planting.crop.name
diff --git a/app/views/plantings/index.html.haml b/app/views/plantings/index.html.haml
index 407a97b41..6e5f53ffe 100644
--- a/app/views/plantings/index.html.haml
+++ b/app/views/plantings/index.html.haml
@@ -11,32 +11,32 @@
   = planting_icon
   = title('plantings', @owner, @crop, @planting)
 
-= render 'layouts/nav', model: Planting
-
-
-%section.border-top
-  .btn-group
-    = link_to plantings_active_tickbox_path(@owner, @show_all), class: 'btn' do
-      = check_box_tag 'active', 'all', @show_all
-      include in-active
-
-    - if @owner
-      = link_to t('.view_owners_profile', owner: @owner), member_path(@owner), class: 'btn'
+.row
+  .col
+    %ul.nav
+      %li.list-group-item
+        = link_to show_inactive_tickbox_path('plantings', owner: @owner, show_all: @show_all) do
+          = check_box_tag 'active', 'all', @show_all
+          include finished
+      - if @owner
+        %li.list-group-item.btn
+          = link_to t('.view_owners_profile', owner: @owner), member_path(@owner)
+  .col= render 'layouts/nav', model: Planting
 
 .row
   .col-12= page_entries_info @plantings
-  .col-12= render 'layouts/pagination', collection: @plantings
+  .col-12= will_paginate @plantings
 
 .index-cards
   - @plantings.each do |planting|
     = render planting, full: true
 
-.row
-  .col-12= page_entries_info @plantings
-  .col-12= render 'layouts/pagination', collection: @plantings
+= will_paginate @plantings
+
+%hr/
 
 %section.open-data
-  %h5= t('label.data')
+  %h3= t('label.data')
   %ul.nav#open-data
     - ['csv', 'json', 'rss'].each do |format|
       %li.list-group-item
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index f173b2ba4..a736dcb67 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -20,13 +20,14 @@
       %h1.plantingtitle
         %span.plantingtitle--icon= planting_icon
         = @planting.to_s.titleize
-
+    .col-md-4.col-xs-12
       = render 'plantings/actions', planting: @planting
 
+    .col-md-8.col-xs-12
       %section= render 'facts', planting: @planting
-
       - if @planting.description.present?
         %hr/
+        = cute_icon
         .card
           .card-header
             %h2 Notes
@@ -36,7 +37,8 @@
       %section= render 'plantings/photos', photos: @photos, planting: @planting
     .col-md-4.col-xs-12
       - if @planting.percentage_grown
-        .card
+        %section.progress-bar
+          %h2 Progress
           .progress
             .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
           %strong.plantingfact--percentagegrown
@@ -46,6 +48,10 @@
       = render @planting.crop
   .row
     .col-md-6
-      %section= render 'plantings/harvests', planting: @planting
+      %section.harvests
+        %a{name: 'harvests'}
+        = render 'plantings/harvests', planting: @planting
     .col-md-6
-      %section= render 'plantings/descendants', planting: @planting
+      %section.descendants
+        %a{name: 'seeds'}
+        = render 'plantings/descendants', planting: @planting
diff --git a/app/views/posts/_single.html.haml b/app/views/posts/_single.html.haml
index 0057e7367..10a372b6d 100644
--- a/app/views/posts/_single.html.haml
+++ b/app/views/posts/_single.html.haml
@@ -17,32 +17,3 @@
 
 :growstuff_markdown
   #{ strip_tags @post.body }
-
--# .card
--#   .post{ id: "post-#{post.id}" }
--#     .row
--#       .col-md-1
--#         = render partial: "members/avatar", locals: { member: post.author }
--#       .col-md-11
--#         - if defined?(subject)
--#           %h3= link_to strip_tags(post.subject), post
-
--#         .post-meta
--#           %p
--#             Posted by
--#             - if post.author
--#               = link_to post.author.login_name, member_path(post.author)
--#             - else
--#               Member Deleted
--#             - if post.forum
--#               in
--#               = link_to post.forum, post.forum
--#             on
--#             = post.created_at
--#             - if post.updated_at > post.created_at
--#               and edited at
--#               = post.updated_at
-
--#         .post-body
--#           :growstuff_markdown
--#             #{ strip_tags post.body }
diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml
index f7d09a620..efa29e670 100644
--- a/app/views/posts/show.html.haml
+++ b/app/views/posts/show.html.haml
@@ -56,11 +56,11 @@
 
   .col-md-4.col-12
     = render @post.author
-    - unless @post.crops.empty?
+    - unless @post.crops.approved.empty?
       %section.crops
         %h2 Crops mentioned in this post
         .index-cards
-          - @post.crops.each do |c|
+          - @post.crops.approved.each do |c|
             = render 'crops/thumbnail', crop: c
 
 
diff --git a/app/views/scientific_names/_form.html.haml b/app/views/scientific_names/_form.html.haml
index 95178f068..95f768aa7 100644
--- a/app/views/scientific_names/_form.html.haml
+++ b/app/views/scientific_names/_form.html.haml
@@ -17,7 +17,7 @@
   .form-group
     = f.label :crop_id, class: 'control-label col-md-2'
     .col-md-8
-      = collection_select(:scientific_name, :crop_id, Crop.all, :id,
+      = collection_select(:scientific_name, :crop_id, Crop.all.order(:name), :id,
         :name, { selected: @scientific_name.crop_id || @crop.id },
         class: 'form-control')
   .form-group
diff --git a/app/views/seeds/_card.html.haml b/app/views/seeds/_card.html.haml
index a6a975ef2..45164e45b 100644
--- a/app/views/seeds/_card.html.haml
+++ b/app/views/seeds/_card.html.haml
@@ -1,12 +1,12 @@
-.card.seed-card
+.card.seed-card{class: seed.active? ? '' : 'card-finished'}
   = link_to seed do
     = image_tag(seed_image_path(seed), alt: seed, class: 'img-card')
+  .text
+    = render 'members/tiny', member: seed.owner
   .card-body
     .card-title
       = crop_icon(seed.crop)
       = link_to seed.crop, seed
-  .card-footer
-    = render 'members/tiny', member: seed.owner
     - if seed.tradable?
       .text-muted
         = icon 'fas', 'map'
diff --git a/app/views/seeds/_facts.html.haml b/app/views/seeds/_facts.html.haml
index 51e19212c..ea155b123 100644
--- a/app/views/seeds/_facts.html.haml
+++ b/app/views/seeds/_facts.html.haml
@@ -1,24 +1,36 @@
 .index-cards.facts.seedfacts
-  .card
-    %h3 Quantity
+  .card{class: seed.quantity.present? ? '' : 'text-muted'}
+    %h3
+      Quantity
+      = editable :text_field, seed, :quantity, display_field: '.seedfacts--quantity'
     %strong.seedfacts--quantity= seed.quantity.blank? ? "not specified" : seed.quantity
-    %span seeds
+    %span
+      seeds
 
-  - if seed.plant_before.present?
-    .card.seedfacts--card
-      %h3 Plant before
-      %strong.seedfacts--plantbefore= I18n.l(seed.plant_before)
+  .card.seedfacts--card{class: seed.plant_before.present? ? '' : 'text-muted'}
+    %h3
+      Plant before
+      = editable :date, seed, :plant_before, display_field: '.seedfacts--plantbefore'
+    %strong.seedfacts--plantbefore
+      - if seed.plant_before.present?
+        = I18n.l(seed.plant_before)
+      - else
+        Unknown
 
   -if seed.finished_at.present?
     .card
       %h3 Finished at
-      %strong.seedfacts--finishedat= I18n.l(seed.finished_at)
-  .card
+
+  .card{class: seed.days_until_maturity_max.present? ? '' : 'text-muted'}
     %h3 Days until maturity
-    %strong.seedfacts--maturity= render partial: 'days_until_maturity', locals: { seed: seed }
+    %strong.seedfacts--maturity
+      = render partial: 'days_until_maturity', locals: { seed: seed }
+    %span days
 
   .card
-    %h3 Will trade
+    %h3
+      Will trade
+      = editable :select, seed, :tradable_to, collection: Seed::TRADABLE_TO_VALUES, display_field: '.seedfacts--tradableto'
     %strong.seedfacts--tradableto= seed.tradable_to
     %span
       - if seed.owner.location.blank?
diff --git a/app/views/seeds/_seed.haml b/app/views/seeds/_seed.haml
index af5f6203f..b6cd078e2 100644
--- a/app/views/seeds/_seed.haml
+++ b/app/views/seeds/_seed.haml
@@ -3,4 +3,4 @@
     = render 'seeds/card', seed: seed
 - else
   - cache seed do
-    = render 'seeds/thumbnail', seed: seed
\ No newline at end of file
+    = render 'seeds/thumbnail', seed: seed
diff --git a/app/views/seeds/index.html.haml b/app/views/seeds/index.html.haml
index 103fe7292..6c74b13d3 100644
--- a/app/views/seeds/index.html.haml
+++ b/app/views/seeds/index.html.haml
@@ -1,17 +1,3 @@
-- content_for :title, title('seeds', @owner, @crop, @planting)
-%h1
-  = seed_icon
-  = title('seeds', @owner, @crop, @planting)
-
-- if @owner
-  = link_to "View #{@owner}'s profile >>", member_path(@owner)
-
-%p
-  #{ENV['GROWSTUFF_SITE_NAME']} helps you track your seed
-  stash or trade seeds with other members.
-
-= render 'layouts/nav', model: Seed
-
 - content_for :breadcrumbs do
   - if @owner
     %li.breadcrumb-item= link_to 'Seeds', seeds_path
@@ -19,16 +5,32 @@
   - else
     %li.breadcrumb-item.active= link_to 'Seeds', seeds_path
 
+- content_for :title, title('seeds', @owner, @crop, @planting)
+%h1
+  = seed_icon
+  = title('seeds', @owner, @crop, @planting)
+
+.row
+  .col
+    %ul.nav
+      %li.list-group-item
+        = link_to show_inactive_tickbox_path('seeds', owner: @owner, show_all: @show_all) do
+          = check_box_tag 'active', 'all', @show_all
+          include finished
+      - if @owner
+        %li.list-group-item.btn
+          = link_to t('.view_owners_profile', owner: @owner), member_path(@owner)
+  .col= render 'layouts/nav', model: Seed
 
 - unless @seeds.empty?
-  .pagination
-    = page_entries_info @seeds
-    = will_paginate @seeds
-  .index-cards= render @seeds, full: true
+  = page_entries_info @seeds
+  = will_paginate @seeds
 
-  .pagination
-    = page_entries_info @seeds
-    = will_paginate @seeds
+  .index-cards
+    - @seeds.each do |seed|
+      = render 'seeds/card', seed: seed
+
+  = will_paginate @seeds
 
 %section.open-data
   %h5= t('label.data')
diff --git a/app/views/seeds/show.html.haml b/app/views/seeds/show.html.haml
index 7ada4e8d9..d2f2a717f 100644
--- a/app/views/seeds/show.html.haml
+++ b/app/views/seeds/show.html.haml
@@ -15,61 +15,66 @@
   %li.breadcrumb-item= link_to @seed.owner, member_seeds_path(@seed.owner)
   %li.breadcrumb-item.active= link_to @seed, @seed
 
-.row.seeds
-  .col-md-8
-    %h1
-      %span.seedtitle--icon= crop_icon(@seed.crop)
-      %strong
-        %span.seedtitle--owner #{@seed.owner}'s
-        %span.seedtitle--crop #{@seed.crop}
-        seeds
-      - if @seed.organic != 'unknown'
-        %small.seedtitle--organic= @seed.organic
-      - if @seed.gmo != 'unknown'
-        %small.seedtitle--gmo= @seed.gmo
-      - if @seed.heirloom != 'unknown'
-        %small.seedtitle--heirloom= @seed.heirloom
-      = I18n.l @seed.created_at.to_date
+.seed
+  .row
+    .col-md-8.col-xs-12
+      %h1
+        %span.seedtitle--icon= crop_icon(@seed.crop)
+        %strong
+          %span.seedtitle--owner #{@seed.owner}'s
+          %span.seedtitle--crop #{@seed.crop}
+          seeds
+        - if @seed.organic != 'unknown'
+          %small.seedtitle--organic= @seed.organic
+        - if @seed.gmo != 'unknown'
+          %small.seedtitle--gmo= @seed.gmo
+        - if @seed.heirloom != 'unknown'
+          %small.seedtitle--heirloom= @seed.heirloom
+        = I18n.l @seed.created_at.to_date
 
-    = render 'seeds/actions', seed: @seed
+    .col-md-4.col-xs-12
+      = render 'seeds/actions', seed: @seed
 
-    %section= render 'facts', seed: @seed
-    - if @seed.parent_planting
-      %dt Saved from planting:
-      %dd
-        = link_to @seed.parent_planting, planting_path(@seed.parent_planting)
-    - unless @seed.description.blank?
-      .card.seed--description
-        .card-header
-          %h2 Notes
-        .card-body
-          :growstuff_markdown
-            #{ @seed.description != "" ? strip_tags(@seed.description) : "No description given." }
+    .col-md-8.col-xs-12
+      %section= render 'facts', seed: @seed
+      - if @seed.parent_planting
+        %dt Saved from planting:
+        %dd
+          = link_to @seed.parent_planting, planting_path(@seed.parent_planting)
+      - unless @seed.description.blank?
+        = cute_icon
+        .card.seed--description
+          .card-header
+            %h2 Notes
+          .card-body
+            :growstuff_markdown
+              #{strip_tags(@seed.description)}
 
-    - if current_member
-      - if @seed.tradable? && current_member != @seed.owner
-        %p= link_to "Request seeds",
-                    new_message_path(recipient_id: @seed.owner.id,
-                                         subject: "Interested in your #{@seed.crop} seeds"),
-                    class: 'btn btn-primary'
-    - else
-      = render 'shared/signin_signup', to: 'request seeds'
+      - if current_member
+        - if @seed.tradable? && current_member != @seed.owner
+          %p= link_to "Request seeds",
+                      new_message_path(recipient_id: @seed.owner.id,
+                                           subject: "Interested in your #{@seed.crop} seeds"),
+                      class: 'btn btn-primary'
+      - else
+        = render 'shared/signin_signup', to: 'request seeds'
 
-    %section= render 'seeds/descendants', seed: @seed
-    %section.seed-photos
-      - @photos.each do |photo|
-        = render 'photos/hero', photo: photo
-    %p
-      %small
-        Or
-        = link_to "purchase seeds via Ebay",
-        crop_ebay_seeds_url(@seed.crop), target: "_blank", rel: "noopener noreferrer", class: 'btn'
-    - if @seed.owner.location
+      %section.plantings
+        = render 'seeds/descendants', seed: @seed
+      %section.seed-photos
+        - @photos.each do |photo|
+          = render 'photos/hero', photo: photo
       %p
         %small
-          View other seeds, members to trade with and more near
-          = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
-  .col-md-4
-    = render 'seeds/owner'
-    = render @seed.crop
+          Or
+          = link_to "purchase seeds via Ebay",
+          crop_ebay_seeds_url(@seed.crop), target: "_blank", rel: "noopener noreferrer", class: 'btn'
+      - if @seed.owner.location
+        %p
+          %small
+            View other seeds, members to trade with and more near
+            = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
+    .col-md-4.col-xs-12
+      = render 'seeds/owner'
+      = render @seed.crop
 
diff --git a/app/views/shared/_global_actions.html.haml b/app/views/shared/_global_actions.html.haml
deleted file mode 100644
index a40849af9..000000000
--- a/app/views/shared/_global_actions.html.haml
+++ /dev/null
@@ -1,25 +0,0 @@
-- if signed_in?
-  .btn-group
-    = link_to member_gardens_path(member_slug: current_member.slug),
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.my_gardens') do
-      = garden_icon
-
-    = link_to timeline_index_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.timeline') do
-      = timeline_icon
-
-    = link_to new_planting_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.new_planting') do
-      = planting_icon
-
-    = link_to new_harvest_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.new_harvest') do
-      = harvest_icon
-
-    = link_to new_seed_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.new_seeds') do
-      = seed_icon
-
-    = link_to new_post_path,
-      class: 'btn btn-default', 'data-toggle': "tooltip", 'data-placement': "bottom", title: t('buttons.new_post') do
-      = post_icon
diff --git a/app/views/shared/_signin_signup.html.haml b/app/views/shared/_signin_signup.html.haml
index 5fae2b0bd..51c7a5ac2 100644
--- a/app/views/shared/_signin_signup.html.haml
+++ b/app/views/shared/_signin_signup.html.haml
@@ -1,7 +1,6 @@
-%p
-  = link_to 'Sign in', new_member_session_path, class: 'btn btn-success'
-  or
-  = link_to 'sign up', new_member_registration_path, class: 'btn btn-info'
-  to
-  = succeed "." do
-    = to
+= link_to 'Sign in', new_member_session_path, class: 'btn btn-success'
+or
+= link_to 'sign up', new_member_registration_path, class: 'btn btn-info'
+to
+= succeed "." do
+  = to
diff --git a/app/views/shared/editable/_date.html.haml b/app/views/shared/editable/_date.html.haml
new file mode 100644
index 000000000..3e9fccfbb
--- /dev/null
+++ b/app/views/shared/editable/_date.html.haml
@@ -0,0 +1,11 @@
+- if can? :edit, model
+  %small.edit-link
+    %a.editable-date#description{"data-field" => "#date--#{model.id}-#{field.to_s}",
+      "data-display": display_field, href: "#"}
+      = edit_icon
+  .hide{id: "date--#{model.id}-#{field.to_s}"}
+    = bootstrap_form_for(model) do |f|
+      = f.text_field field,
+               value: model.send(field) ? model.send(field).to_s(:ymd) : '',
+               class: 'add-datepicker', label: 'When?'
+      = f.submit :save
diff --git a/app/views/shared/editable/_form.html.haml b/app/views/shared/editable/_form.html.haml
new file mode 100644
index 000000000..1c51efdae
--- /dev/null
+++ b/app/views/shared/editable/_form.html.haml
@@ -0,0 +1,18 @@
+- if can? :edit, model
+  %small.edit-link
+    %a.editable{"data-form" => "#form--#{model.id}-#{field.to_s}", "data-display": display_field, href: "#", name: "#form--#{model.id}-#{field.to_s}"}
+      = edit_icon
+
+  .hide{id: "form--#{model.id}-#{field.to_s}"}
+    = bootstrap_form_for(model) do |f|
+      - if field_type == :text_area
+        = f.text_area field
+      - elsif field_type == :text_field
+        = f.text_field field
+      - elsif field_type == :select
+        = f.select field, collection
+      - elsif field_type == :date
+        = f.text_field field,
+                 value: model.send(field) ? model.send(field).to_s(:ymd) : '',
+                 class: 'add-datepicker', label: 'When?'
+      = f.submit :save
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e14b1a037..5285d5569 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -206,7 +206,9 @@ en:
       number_plantings_linktext: "%{count} times"
   label:
     days_until_harvest: "%{number} days"
+    weeks_until_harvest: "%{number} weeks until harvest"
     days_until_finished: "%{number} days"
+    weeks_until_finished: "%{number} weeks"
     harvesting_now: harvesting now
     data: 'The data on this page is available in the following formats:'
   layouts:
@@ -226,6 +228,7 @@ en:
       gardens: Gardens
       harvest: Harvest
       harvests: Harvests
+      record: Record
       inbox: Inbox
       inbox_unread: Inbox (%{unread_count})
       plantings: Plantings
diff --git a/spec/controllers/charts/gardens_controller_spec.rb b/spec/controllers/charts/gardens_controller_spec.rb
index 1eb959b29..d264388f6 100644
--- a/spec/controllers/charts/gardens_controller_spec.rb
+++ b/spec/controllers/charts/gardens_controller_spec.rb
@@ -9,7 +9,7 @@ describe Charts::GardensController do
     describe 'GET timeline' do
       before { get :timeline, params: { garden_id: garden.to_param } }
 
-      it { expect(response).to be_success }
+      it { expect(response).to be_successful }
     end
   end
 
@@ -21,7 +21,7 @@ describe Charts::GardensController do
     describe 'GET timeline' do
       before { get :timeline, params: { garden_id: garden.to_param } }
 
-      it { expect(response).to be_success }
+      it { expect(response).to be_successful }
     end
   end
 end
diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb
index 057226c4a..2602673b0 100644
--- a/spec/features/crops/crop_detail_page_spec.rb
+++ b/spec/features/crops/crop_detail_page_spec.rb
@@ -1,6 +1,9 @@
 require 'rails_helper'
 
 describe "crop detail page", js: true do
+  before do
+    FactoryBot.create :plant_part, name: 'leaf'
+  end
   subject do
     # Update the medians after all the
     # data has been loaded
@@ -26,13 +29,16 @@ describe "crop detail page", js: true do
       before { subject }
 
       it "has a link to plant the crop" do
-        expect(page).to have_link "Plant #{crop.name}", href: new_planting_path(crop_id: crop.id)
+        click_link 'Add to garden'
+        expect(page).to have_link "add new garden"
       end
       it "has a link to harvest the crop" do
-        expect(page).to have_link "Harvest #{crop.name}", href: new_harvest_path(crop_id: crop.id)
+        click_link 'Record harvest'
+        expect(page).to have_link "leaf"
       end
       it "has a link to add seeds" do
-        expect(page).to have_link "Add #{crop.name} seeds to stash", href: new_seed_path(crop_id: crop.id)
+        click_link 'Save seeds'
+        expect(page).to have_link "Will trade: nowhere"
       end
     end
 
diff --git a/spec/features/gardens/index_spec.rb b/spec/features/gardens/index_spec.rb
index 526bba7c9..ba3d137d2 100644
--- a/spec/features/gardens/index_spec.rb
+++ b/spec/features/gardens/index_spec.rb
@@ -103,8 +103,7 @@ describe "Gardens#index", :js do
 
       it { expect(page).to have_link href: planting_path(planting) }
       it { expect(page).to have_link href: garden_path(planting.garden) }
-      it { expect(page).to have_text '50 days' }
-      it { expect(page).to have_text '90 days' }
+      it { expect(page).to have_text '7 weeks' }
       it { expect(page).not_to have_text 'harvesting now' }
     end
 
@@ -120,8 +119,7 @@ describe "Gardens#index", :js do
       it { expect(crop.median_lifespan).to eq 90 }
 
       it { expect(page).to have_text 'harvesting now' }
-      it { expect(page).to have_text '39 days' }
-      it { expect(page).not_to have_text 'Predicted days until harvest' }
+      it { expect(page).not_to have_text 'Predicted weeks until harvest' }
     end
 
     describe 'super late' do
@@ -133,8 +131,8 @@ describe "Gardens#index", :js do
 
       it { expect(page).to have_text 'super late' }
       it { expect(page).not_to have_text 'harvesting now' }
-      it { expect(page).not_to have_text 'Predicted days until harvest' }
-      it { expect(page).not_to have_text 'Predicted days until planting is finished' }
+      it { expect(page).not_to have_text 'Predicted weeks until harvest' }
+      it { expect(page).not_to have_text 'Predicted weeks until planting is finished' }
     end
   end
 end
diff --git a/spec/features/harvests/harvesting_a_crop_spec.rb b/spec/features/harvests/harvesting_a_crop_spec.rb
index e7aeea3d6..a3261525a 100644
--- a/spec/features/harvests/harvesting_a_crop_spec.rb
+++ b/spec/features/harvests/harvesting_a_crop_spec.rb
@@ -47,14 +47,8 @@ describe "Harvesting a crop", :js, :elasticsearch do
     describe "Harvesting from crop page" do
       before do
         visit crop_path(maize)
-        within '.crop-actions' do
-          click_link "Harvest #{maize.name}"
-        end
-        within "form#new_harvest" do
-          choose plant_part.name
-          expect(page).to have_selector "input[value='maize']"
-          click_button "Save"
-        end
+        click_link 'Record harvest'
+        click_link plant_part.name
       end
 
       it { expect(page).to have_content "harvest was successfully created." }
@@ -65,10 +59,8 @@ describe "Harvesting a crop", :js, :elasticsearch do
       let!(:planting) { create :planting, crop: maize, owner: member, garden: member.gardens.first }
       before do
         visit planting_path(planting)
-        click_link "Record Harvest"
-
-        choose plant_part.name
-        click_button "Save"
+        click_link "Record harvest"
+        click_link plant_part.name
       end
 
       it { expect(page).to have_content "harvest was successfully created." }
diff --git a/spec/features/plantings/planting_a_crop_spec.rb b/spec/features/plantings/planting_a_crop_spec.rb
index 5a262ecbb..b6eb4fe76 100644
--- a/spec/features/plantings/planting_a_crop_spec.rb
+++ b/spec/features/plantings/planting_a_crop_spec.rb
@@ -2,8 +2,8 @@ require "rails_helper"
 require 'custom_matchers'
 
 describe "Planting a crop", :js, :elasticsearch do
-  let!(:maize) { FactoryBot.create :maize                 }
-  let(:garden) { FactoryBot.create :garden, owner: member }
+  let!(:maize) { FactoryBot.create :maize }
+  let(:garden) { FactoryBot.create :garden, owner: member, name: 'Orchard' }
   let!(:planting) do
     FactoryBot.create :planting, garden: garden, owner: member, planted_at: Date.parse("2013-03-10")
   end
@@ -160,16 +160,8 @@ describe "Planting a crop", :js, :elasticsearch do
 
     it "Planting from crop page" do
       visit crop_path(maize)
-      within '.crop-actions' do
-        click_link "Plant maize"
-      end
-      within "form#new_planting" do
-        expect(page).to have_selector "input[value='maize']"
-      end
-
-      choose(member.gardens.first.name)
-      click_button "Save"
-
+      click_link "Add to garden"
+      click_link "Orchard"
       expect(page).to have_content "planting was successfully created"
       expect(page).to have_content "maize"
     end
@@ -224,7 +216,7 @@ describe "Planting a crop", :js, :elasticsearch do
       end
       expect(page).to have_content "planting was successfully created"
       expect(page).to have_content "Finished"
-      expect(page).to have_content "30 Aug"
+      expect(page).to have_content "Aug 2014"
 
       # shouldn't be on the page
       visit plantings_path
diff --git a/spec/features/plantings/show_spec.rb b/spec/features/plantings/show_spec.rb
index e9d39fca3..c2e01c0a4 100644
--- a/spec/features/plantings/show_spec.rb
+++ b/spec/features/plantings/show_spec.rb
@@ -22,10 +22,10 @@ describe "Display a planting", :js, :elasticsearch do
   end
 
   context 'Annual with predicted finish' do
-    let(:planting) { FactoryBot.create :predicatable_planting, planted_at: 1.day.ago }
-    it { expect(find('.plantingfact--dayssinceplanted')).to have_text '1' }
-    it { expect(find('.plantingfact--percentagegrown')).to have_text '2%' }
-    it { expect(find('.plantingfact--planttedat')).to have_text I18n.l(1.day.ago.to_date) }
+    let(:planting) { FactoryBot.create :predicatable_planting, planted_at: 2.weeks.ago }
+    it { expect(find('.plantingfact--weekssinceplanted')).to have_text '2' }
+    it { expect(find('.plantingfact--percentagegrown')).to have_text '28%' }
+    it { expect(find('.plantingfact--planttedat')).to have_text I18n.l(2.weeks.ago.to_date) }
     it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
   end
 
diff --git a/spec/features/seeds/adding_seeds_spec.rb b/spec/features/seeds/adding_seeds_spec.rb
index e2264eaa2..6ec0b1bd3 100644
--- a/spec/features/seeds/adding_seeds_spec.rb
+++ b/spec/features/seeds/adding_seeds_spec.rb
@@ -57,11 +57,8 @@ describe "Seeds", :js, :elasticsearch do
     describe "Adding a seed from crop page" do
       before do
         visit crop_path(maize)
-        click_link "Add maize seeds to stash"
-        within "form#new_seed" do
-          expect(page).to have_selector "input[value='maize']"
-          click_button "Save"
-        end
+        click_link "Save seeds"
+        click_link "Will trade: nowhere"
       end
 
       it { expect(page).to have_content "Successfully added maize seed to your stash" }
diff --git a/spec/features/seeds/misc_seeds_spec.rb b/spec/features/seeds/misc_seeds_spec.rb
index 53587ede5..a1d047daf 100644
--- a/spec/features/seeds/misc_seeds_spec.rb
+++ b/spec/features/seeds/misc_seeds_spec.rb
@@ -19,6 +19,7 @@ describe "seeds", js: true do
     describe "button on front page to add seeds" do
       before do
         visit root_path
+        click_link 'Record'
         click_link(href: new_seed_path)
       end
 
@@ -29,7 +30,7 @@ describe "seeds", js: true do
     describe "Clicking link to owner's profile" do
       before do
         visit member_seeds_path(member)
-        click_link "View #{member}'s profile >>"
+        click_link "View Owners Profile"
       end
 
       it { expect(current_path).to eq member_path(member) }
diff --git a/spec/features/shared_examples/append_date.rb b/spec/features/shared_examples/append_date.rb
index 8dc283c22..2680dac30 100644
--- a/spec/features/shared_examples/append_date.rb
+++ b/spec/features/shared_examples/append_date.rb
@@ -1,5 +1,6 @@
 shared_examples "append date" do
   let(:this_month) { Time.zone.today.strftime("%b") }
+  let(:this_year) { Time.zone.today.year }
 
   before { visit path }
 
@@ -13,7 +14,7 @@ shared_examples "append date" do
       end
     end
     it { expect(page).to have_content "Finished" }
-    it { expect(page).to have_content "21 #{this_month}" }
+    it { expect(page).to have_content "#{this_month} #{this_year}" }
   end
 
   describe "Confirming without selecting date" do
diff --git a/spec/views/photos/index.html.haml_spec.rb b/spec/views/photos/index.html.haml_spec.rb
index f3eae4739..ef058e822 100644
--- a/spec/views/photos/index.html.haml_spec.rb
+++ b/spec/views/photos/index.html.haml_spec.rb
@@ -17,6 +17,6 @@ describe "photos/index" do
   it "renders a gallery of photos" do
     render
     assert_select ".photo-card", count: 2
-    assert_select "img", count: 2
+    assert_select "img.img-card", count: 2
   end
 end

From 6d472c5d669109e592569e56d6d6105f846740fa Mon Sep 17 00:00:00 2001
From: codefactor-io <support@codefactor.io>
Date: Mon, 7 Oct 2019 23:35:39 +0000
Subject: [PATCH 061/142] [CodeFactor] Apply fixes

---
 app/controllers/admin/roles_controller.rb | 70 +++++++++++------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index 5950cb165..7135ce611 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -1,47 +1,47 @@
 module Admin
-class RolesController < ApplicationController
-  before_action :authenticate_member!
-  load_and_authorize_resource
-  respond_to :html
-  responders :flash
+  class RolesController < ApplicationController
+    before_action :authenticate_member!
+    load_and_authorize_resource
+    respond_to :html
+    responders :flash
 
-  def index
-    @roles = Role.all.order(:name)
-    respond_with @roles
-  end
+    def index
+      @roles = Role.all.order(:name)
+      respond_with @roles
+    end
 
-  def show
-    respond_with @role
-  end
+    def show
+      respond_with @role
+    end
 
-  def new
-    @role = Role.new
-    respond_with @role
-  end
+    def new
+      @role = Role.new
+      respond_with @role
+    end
 
-  def edit
-    respond_with @role
-  end
+    def edit
+      respond_with @role
+    end
 
-  def create
-    @role = Role.create(role_params)
-    respond_with @role, location: admin_roles_path
-  end
+    def create
+      @role = Role.create(role_params)
+      respond_with @role, location: admin_roles_path
+    end
 
-  def update
-    @role.update(role_params)
-    respond_with @role, location: admin_roles_path
-  end
+    def update
+      @role.update(role_params)
+      respond_with @role, location: admin_roles_path
+    end
 
-  def destroy
-    @role.destroy
-    respond_with @role, location: admin_roles_path
-  end
+    def destroy
+      @role.destroy
+      respond_with @role, location: admin_roles_path
+    end
 
-  private
+    private
 
-  def role_params
-    params.require(:role).permit(:description, :name, :members, :slug)
+    def role_params
+      params.require(:role).permit(:description, :name, :members, :slug)
+    end
   end
 end
-end
\ No newline at end of file

From fd39d6ef8cee17d5c89056291e7eba9bdea0accb Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 8 Oct 2019 15:54:53 +1300
Subject: [PATCH 062/142] More per page

---
 app/models/application_record.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 31fc9c587..e14f64e66 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,4 +1,4 @@
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
-  self.per_page = 12
+  self.per_page = 36
 end

From 80b82a99fe29ef65e5ae34439ffb2a310a9e2816 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 09:41:09 +1300
Subject: [PATCH 063/142] Fix broken spec on dev

---
 app/controllers/posts_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 0180b1b8d..0c77df2d5 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -67,6 +67,6 @@ class PostsController < ApplicationController
       @author.posts
     else
       Post
-    end.order(created_at: :desc).includes(:author, comments: :author).paginate(page: params[:page])
+    end.order(created_at: :desc).includes(:author, comments: :author).paginate(page: params[:page], per_page: 12)
   end
 end

From a6cb81f4d1289aa37b88209cd659b1f342da6abd Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 18 Oct 2019 09:37:08 +1300
Subject: [PATCH 064/142] Widen gardens on gardens#index

---
 app/views/gardens/index.html.haml       | 48 ++++++++++++-------------
 app/views/plantings/_progress_list.haml |  6 ++--
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/app/views/gardens/index.html.haml b/app/views/gardens/index.html.haml
index d4fba0eae..7e59e143e 100644
--- a/app/views/gardens/index.html.haml
+++ b/app/views/gardens/index.html.haml
@@ -25,31 +25,29 @@
 - else
   = page_entries_info @gardens
   = will_paginate @gardens
-  .row
-    - @gardens.each do |garden|
-      .col-md-6.col-12
-        %section.card
-          %h2= link_to garden.name, garden
-          .card-header
-            .row
-              - unless @owner.present?
-                .col
-                  owner:
-                  = render 'members/tiny', member: garden.owner
-              .col= render 'gardens/actions', garden: garden
-              .col
-                - if garden.plantings.any?
-                  - if garden.plantings.active.perennial.any?
-                    %strong Perennials:
-                    - garden.plantings.active.perennial.each do |planting|
-                      = link_to planting do
-                        = crop_icon planting.crop
-                        = planting.crop
-          .card-body
-            - if garden.plantings.active.annual.any?
-              = render 'plantings/progress_list', plantings: garden.plantings.active.annual
-            - else
-              No annual plantings
+  - @gardens.each do |garden|
+    %section.card
+      %h2= link_to garden.name, garden
+      .card-header
+        .row
+          .col-12.col-md-3
+            - unless @owner.present?
+              owner:
+              = render 'members/tiny', member: garden.owner
+            = image_tag garden_image_path(garden), alt: garden.name, class: 'img-card'
+          .col-12.col-md-2= render 'gardens/actions', garden: garden
+          .col
+            - if garden.plantings.active.perennial.any?
+              %strong Perennials:
+              - garden.plantings.active.perennial.each do |planting|
+                = link_to planting do
+                  = crop_icon planting.crop
+                  = planting.crop
+      .card-body
+        - if garden.plantings.active.annual.any?
+          = render 'plantings/progress_list', plantings: garden.plantings.active.annual
+        - else
+          No annual plantings
 
   .row
     .col-12= page_entries_info @gardens
diff --git a/app/views/plantings/_progress_list.haml b/app/views/plantings/_progress_list.haml
index 79e9f0246..b56320ed8 100644
--- a/app/views/plantings/_progress_list.haml
+++ b/app/views/plantings/_progress_list.haml
@@ -1,11 +1,11 @@
-- plantings.includes(:crop).annual.order("crops.name").each_with_index do |planting, i|
+- plantings.includes(:crop).annual.order(:planted_at).each_with_index do |planting, i|
   - if i.positive?
     %hr/
   .row.progress-row
-    .col-6.col-md-4.progress-row--crop
+    .col-12.col-md-4.progress-row--crop
       = render 'plantings/tiny', planting: planting
       = render 'plantings/badges', planting: planting
-    .col-6.col-md-6.progress-row--bar
+    .col-12.col-md-6.progress-row--bar
       - if planting.planted_at.blank?
         %small set "planted" date to allow predictions
       - elsif planting.percentage_grown.blank?

From dc3bc857777498b7c6f94b173ab0ea042083b29c Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 09:44:05 +1300
Subject: [PATCH 065/142] Remove comments

---
 app/controllers/posts_controller.rb | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 0c77df2d5..d6561ce8e 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -5,36 +5,25 @@ class PostsController < ApplicationController
   respond_to :html, :json
   respond_to :rss, only: %i(index show)
 
-  # GET /posts
-  # GET /posts.json
-  # GET /posts.rss
   def index
     @author = Member.find_by(slug: params[:member_slug])
     @posts = posts
     respond_with(@posts)
   end
 
-  # GET /posts/1
-  # GET /posts/1.json
-  # GET /posts/1.rss
   def show
     @post = Post.includes(:author, comments: :author).find(params[:id])
     respond_with(@post)
   end
 
-  # GET /posts/new
-  # GET /posts/new.json
   def new
     @post = Post.new
     @forum = Forum.find_by(id: params[:forum_id])
     respond_with(@post)
   end
 
-  # GET /posts/1/edit
   def edit; end
 
-  # POST /posts
-  # POST /posts.json
   def create
     params[:post][:author_id] = current_member.id
     @post = Post.new(post_params)
@@ -42,15 +31,11 @@ class PostsController < ApplicationController
     respond_with(@post)
   end
 
-  # PUT /posts/1
-  # PUT /posts/1.json
   def update
     flash[:notice] = 'Post was successfully updated.' if @post.update(post_params)
     respond_with(@post)
   end
 
-  # DELETE /posts/1
-  # DELETE /posts/1.json
   def destroy
     flash[:notice] = 'Post was deleted.' if @post.destroy
     respond_with(@post)

From c940ba447ef7c602c67ea016a8a0bb9bcd083781 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 09:47:29 +1300
Subject: [PATCH 066/142] Add source for leaflet, fixes #2217

---
 Gemfile      | 2 +-
 Gemfile.lock | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 98f5a7e7b..2672e0aaf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ gem 'gibbon', '~>1.2.0'            # for Mailchimp newsletter subscriptions
 
 # Maps
 gem 'leaflet-rails'
-gem 'rails-assets-leaflet.markercluster'
+gem 'rails-assets-leaflet.markercluster', source: 'https://rails-assets.org'
 
 gem 'pg', '< 1.0.0'                # Upstream bug, see https://github.com/Growstuff/growstuff/pull/1539
 gem 'ruby-units'                   # for unit conversion
diff --git a/Gemfile.lock b/Gemfile.lock
index b6eb02eaf..5dc18108e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,6 @@
 GEM
   remote: https://rubygems.org/
+  remote: https://rails-assets.org/
   specs:
     abstract_type (0.0.7)
     actioncable (5.2.2.1)
@@ -631,7 +632,7 @@ DEPENDENCIES
   puma
   rack-protection (>= 2.0.1)
   rails (= 5.2.2.1)
-  rails-assets-leaflet.markercluster
+  rails-assets-leaflet.markercluster!
   rails-controller-testing
   rails_12factor
   rake (>= 10.0.0)

From 2ddddb1652e5f9afcf71720dc260d6dc210446e7 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 10:16:02 +1300
Subject: [PATCH 067/142] Updated specs for admin editing roles

---
 app/controllers/admin/roles_controller.rb     |  4 --
 .../admin/roles_controller_spec.rb            | 38 +++++++++++++++++++
 spec/controllers/roles_controller_spec.rb     | 18 ---------
 3 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 spec/controllers/admin/roles_controller_spec.rb
 delete mode 100644 spec/controllers/roles_controller_spec.rb

diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index 7135ce611..c1cfb8685 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -10,10 +10,6 @@ module Admin
       respond_with @roles
     end
 
-    def show
-      respond_with @role
-    end
-
     def new
       @role = Role.new
       respond_with @role
diff --git a/spec/controllers/admin/roles_controller_spec.rb b/spec/controllers/admin/roles_controller_spec.rb
new file mode 100644
index 000000000..23a4cc39b
--- /dev/null
+++ b/spec/controllers/admin/roles_controller_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+describe Admin::RolesController do
+  let(:valid_attributes) { { "name" => "MyString" } }
+  let!(:role) { Role.create! valid_attributes }
+
+  context 'as admin' do
+    login_member(:admin_member)
+
+    describe "GET index" do
+      before { get :index }
+      it { expect(assigns(:roles)).to eq([Role.find_by(name: 'admin'), role]) }
+    end
+
+    describe "GET new" do
+      before { get :new }
+      it { expect(assigns(:role)).to be_a(Role) }
+    end
+
+    describe "create" do
+      it do
+        expect { post :create, params: { role: { name: ' new role' } } }.to change(Role, :count).by(1)
+        # doesn't allow duplicates
+        expect { post :create, params: { role: { name: ' new role' } } }.not_to change(Role, :count)
+      end
+    end
+
+    describe "GET edit" do
+      before { get :edit, params: { id: role.to_param } }
+      it { expect(assigns(:role)).to eq(role) }
+    end
+
+    describe "update" do
+      before { patch :update, params: { id: role.id, role: { name: 'updated role' } } }
+      it { expect(Role.first.name).to eq 'updated role' }
+    end
+  end
+end
diff --git a/spec/controllers/roles_controller_spec.rb b/spec/controllers/roles_controller_spec.rb
deleted file mode 100644
index 17fe48dfe..000000000
--- a/spec/controllers/roles_controller_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'rails_helper'
-
-describe RolesController do
-  def valid_attributes
-    { "name" => "MyString" }
-  end
-
-  login_member(:admin_member)
-
-  describe "GET index" do
-    it "assigns all roles as @roles" do
-      role = Role.create! valid_attributes
-      get :index, params: {}
-      # note that admin role exists because of login_admin_member
-      assigns(:roles).should eq([Role.find_by(name: 'admin'), role])
-    end
-  end
-end

From 5a6d0f6342ba6c772b7c6206987f38979efb4b49 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 10:22:27 +1300
Subject: [PATCH 068/142] Check admin before roles controller runs

---
 app/controllers/admin/members_controller.rb   |  5 ++--
 app/controllers/admin/roles_controller.rb     |  6 +++-
 .../admin/roles_controller_spec.rb            | 30 +++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index 31d85f643..d3aafdd41 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -1,8 +1,9 @@
 module Admin
   class MembersController < ApplicationController
-    before_action :auth!
+    before_action :is_admin?
     load_and_authorize_resource
     respond_to :html
+    responders :flash
 
     def index
       @members = Member.all
@@ -33,7 +34,7 @@ module Admin
       params[:q]
     end
 
-    def auth!
+    def is_admin?
       authorize! :manage, :all
     end
   end
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index c1cfb8685..d52c7d3cd 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -1,6 +1,6 @@
 module Admin
   class RolesController < ApplicationController
-    before_action :authenticate_member!
+    before_action :is_admin?
     load_and_authorize_resource
     respond_to :html
     responders :flash
@@ -36,6 +36,10 @@ module Admin
 
     private
 
+    def is_admin?
+      authorize! :manage, :all
+    end
+
     def role_params
       params.require(:role).permit(:description, :name, :members, :slug)
     end
diff --git a/spec/controllers/admin/roles_controller_spec.rb b/spec/controllers/admin/roles_controller_spec.rb
index 23a4cc39b..86694a74b 100644
--- a/spec/controllers/admin/roles_controller_spec.rb
+++ b/spec/controllers/admin/roles_controller_spec.rb
@@ -4,6 +4,36 @@ describe Admin::RolesController do
   let(:valid_attributes) { { "name" => "MyString" } }
   let!(:role) { Role.create! valid_attributes }
 
+  context 'as member' do
+    login_member(:member)
+
+    describe "GET index" do
+      before { get :index }
+      it { expect(assigns(:roles)).to eq(nil) }
+    end
+
+    describe "GET new" do
+      before { get :new }
+      it { expect(assigns(:role)).to eq nil }
+    end
+
+    describe "create" do
+      it do
+        expect { post :create, params: { role: { name: ' new role' } } }.not_to change(Role, :count)
+      end
+    end
+
+    describe "GET edit" do
+      before { get :edit, params: { id: role.to_param } }
+      it { expect(assigns(:role)).to eq(nil) }
+    end
+
+    describe "update" do
+      before { patch :update, params: { id: role.id, role: { name: 'updated role' } } }
+      it { expect(Role.first.name).to eq 'MyString' }
+    end
+  end
+
   context 'as admin' do
     login_member(:admin_member)
 

From 35c9b70bc94a81f294949c802edb0eea1c08532d Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 10:23:39 +1300
Subject: [PATCH 069/142] Remove email from display in admin/members

---
 app/views/admin/members/index.html.haml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/admin/members/index.html.haml b/app/views/admin/members/index.html.haml
index 5791ba65d..4d276fc49 100644
--- a/app/views/admin/members/index.html.haml
+++ b/app/views/admin/members/index.html.haml
@@ -16,12 +16,10 @@
     %tr
       %th{scope: "col"} #
       %th{scope: "col"} Login Name
-      %th{scope: "col"} Email
   - @members.each do |member|
     %tr
       %td= render 'members/tiny', member: member
       %td= member.login_name
-      %td= member.email
       %td
         %ul
           - member.roles.pluck(:name).each do |r|

From fc07571ee107d19dfe8dccf86d29d9f94686ae54 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 10:25:12 +1300
Subject: [PATCH 070/142] Rename `is_admin?` to `admin?`.

---
 app/controllers/admin/members_controller.rb | 4 ++--
 app/controllers/admin/roles_controller.rb   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index d3aafdd41..5f35a203c 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -1,6 +1,6 @@
 module Admin
   class MembersController < ApplicationController
-    before_action :is_admin?
+    before_action :admin?
     load_and_authorize_resource
     respond_to :html
     responders :flash
@@ -34,7 +34,7 @@ module Admin
       params[:q]
     end
 
-    def is_admin?
+    def admin?
       authorize! :manage, :all
     end
   end
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index d52c7d3cd..d596f6165 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -1,6 +1,6 @@
 module Admin
   class RolesController < ApplicationController
-    before_action :is_admin?
+    before_action :admin?
     load_and_authorize_resource
     respond_to :html
     responders :flash
@@ -36,7 +36,7 @@ module Admin
 
     private
 
-    def is_admin?
+    def admin?
       authorize! :manage, :all
     end
 

From 75897bad5157d47df9055af3d1e232455f4d63c0 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 10:28:24 +1300
Subject: [PATCH 071/142] Update routing specs for admin roles

---
 spec/routing/roles_routing_spec.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/routing/roles_routing_spec.rb b/spec/routing/roles_routing_spec.rb
index 7b6469efb..c601e27e3 100644
--- a/spec/routing/roles_routing_spec.rb
+++ b/spec/routing/roles_routing_spec.rb
@@ -1,33 +1,33 @@
 require "rails_helper"
 
-describe RolesController do
+describe Admin::RolesController do
   describe "routing" do
     it "routes to #index" do
-      get("/roles").should route_to("roles#index")
+      expect(get("/admin/roles")).to route_to("admin/roles#index")
     end
 
     it "routes to #new" do
-      get("/roles/new").should route_to("roles#new")
+      expect(get("/admin/roles/new")).to route_to("admin/roles#new")
     end
 
     it "routes to #show" do
-      get("/roles/1").should route_to("roles#show", id: "1")
+      expect(get("/admin/roles/1")).to route_to("admin/roles#show", id: "1")
     end
 
     it "routes to #edit" do
-      get("/roles/1/edit").should route_to("roles#edit", id: "1")
+      expect(get("/admin/roles/1/edit")).to route_to("admin/roles#edit", id: "1")
     end
 
     it "routes to #create" do
-      post("/roles").should route_to("roles#create")
+      expect(post("/admin/roles")).to route_to("admin/roles#create")
     end
 
     it "routes to #update" do
-      put("/roles/1").should route_to("roles#update", id: "1")
+      expect(put("/admin/roles/1")).to route_to("admin/roles#update", id: "1")
     end
 
     it "routes to #destroy" do
-      delete("/roles/1").should route_to("roles#destroy", id: "1")
+      expect(delete("/admin/roles/1")).to route_to("admin/roles#destroy", id: "1")
     end
   end
 end

From 09651687503ea6df3e2c9ada4778c00fd70d3158 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 11:24:17 +1300
Subject: [PATCH 072/142] Group previous plantings by year

---
 app/controllers/gardens_controller.rb |  4 +---
 app/views/gardens/_previously.haml    | 13 +++++++++++++
 app/views/gardens/show.html.haml      | 12 +++---------
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 app/views/gardens/_previously.haml

diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index 4fff56da5..d6f8680e6 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -20,9 +20,7 @@ class GardensController < ApplicationController
     @current_plantings = @garden.plantings.current
       .includes(:crop, :owner)
       .order(planted_at: :desc)
-    @finished_plantings = @garden.plantings.finished
-      .includes(:crop)
-      .order(finished_at: :desc)
+    @finished_plantings = @garden.plantings.finished.includes(:crop)
     respond_with(@garden)
   end
 
diff --git a/app/views/gardens/_previously.haml b/app/views/gardens/_previously.haml
new file mode 100644
index 000000000..0bb5bfb2b
--- /dev/null
+++ b/app/views/gardens/_previously.haml
@@ -0,0 +1,13 @@
+%h2 Previously planted in this garden
+
+- if @finished_plantings.size.positive?
+  - year = nil
+  - @finished_plantings.order(planted_at: :desc).each do |planting|
+    - if year != planting.planted_at.year
+      - year = planting.planted_at.year
+      %h4= year
+    = render "plantings/tiny",  planting: planting
+- else
+  .col-md-12
+    %p Nothing has been planted here.
+
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index 8c0aa69d3..5ab477951 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -56,15 +56,9 @@
         - else
           .col-md-12
             %p Nothing is currently planted here.
-    %section
-      %h2 Previously planted in this garden
-      .index-cards
-        - if @finished_plantings.size.positive?
-          - @finished_plantings.each do |planting|
-            = render "plantings/tiny",  planting: planting
-        - else
-          .col-md-12
-            %p Nothing has been planted here.
+
+    %section= render 'previously'
+
   .col-md-3
     .card
       .card-image

From 6bd7e139a677c7c383f4294a6147b3995c96cda1 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 16:04:16 +1300
Subject: [PATCH 073/142] Move views specs to admin

---
 spec/views/{ => admin}/roles/edit.html.haml_spec.rb  | 2 +-
 spec/views/{ => admin}/roles/index.html.haml_spec.rb | 2 +-
 spec/views/{ => admin}/roles/new.html.haml_spec.rb   | 2 +-
 spec/views/{ => admin}/roles/show.html.haml_spec.rb  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename spec/views/{ => admin}/roles/edit.html.haml_spec.rb (94%)
 rename spec/views/{ => admin}/roles/index.html.haml_spec.rb (94%)
 rename spec/views/{ => admin}/roles/new.html.haml_spec.rb (94%)
 rename spec/views/{ => admin}/roles/show.html.haml_spec.rb (92%)

diff --git a/spec/views/roles/edit.html.haml_spec.rb b/spec/views/admin/roles/edit.html.haml_spec.rb
similarity index 94%
rename from spec/views/roles/edit.html.haml_spec.rb
rename to spec/views/admin/roles/edit.html.haml_spec.rb
index f546c7c21..5976faebe 100644
--- a/spec/views/roles/edit.html.haml_spec.rb
+++ b/spec/views/admin/roles/edit.html.haml_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "roles/edit" do
+describe "admin/roles/edit" do
   before do
     @role = assign(:role, stub_model(Role,
       name:        "MyString",
diff --git a/spec/views/roles/index.html.haml_spec.rb b/spec/views/admin/roles/index.html.haml_spec.rb
similarity index 94%
rename from spec/views/roles/index.html.haml_spec.rb
rename to spec/views/admin/roles/index.html.haml_spec.rb
index a666a4ac8..b94d20dba 100644
--- a/spec/views/roles/index.html.haml_spec.rb
+++ b/spec/views/admin/roles/index.html.haml_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "roles/index" do
+describe "admin/roles/index" do
   before do
     controller.stub(:current_user) { nil }
     assign(:roles, [
diff --git a/spec/views/roles/new.html.haml_spec.rb b/spec/views/admin/roles/new.html.haml_spec.rb
similarity index 94%
rename from spec/views/roles/new.html.haml_spec.rb
rename to spec/views/admin/roles/new.html.haml_spec.rb
index d04afacef..4b439aded 100644
--- a/spec/views/roles/new.html.haml_spec.rb
+++ b/spec/views/admin/roles/new.html.haml_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "roles/new" do
+describe "admin/roles/new" do
   before do
     assign(:role, stub_model(Role,
       name:        "MyString",
diff --git a/spec/views/roles/show.html.haml_spec.rb b/spec/views/admin/roles/show.html.haml_spec.rb
similarity index 92%
rename from spec/views/roles/show.html.haml_spec.rb
rename to spec/views/admin/roles/show.html.haml_spec.rb
index 1f41bb23c..23caef8b0 100644
--- a/spec/views/roles/show.html.haml_spec.rb
+++ b/spec/views/admin/roles/show.html.haml_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "roles/show" do
+describe "admin/roles/show" do
   before do
     @role = assign(:role, stub_model(Role,
       name:        "Name",

From bb72d2b9748a5b9943d7911130de859a1ac17f69 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 18:20:01 +1300
Subject: [PATCH 074/142] Fix bug showing plantings with no planted_at

---
 app/views/gardens/_previously.haml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/gardens/_previously.haml b/app/views/gardens/_previously.haml
index 0bb5bfb2b..c0c8d9968 100644
--- a/app/views/gardens/_previously.haml
+++ b/app/views/gardens/_previously.haml
@@ -1,12 +1,17 @@
 %h2 Previously planted in this garden
 
-- if @finished_plantings.size.positive?
+- if @finished_plantings.any?
   - year = nil
-  - @finished_plantings.order(planted_at: :desc).each do |planting|
+  - @finished_plantings.where.not(planted_at: nil).order(planted_at: :desc).each do |planting|
     - if year != planting.planted_at.year
       - year = planting.planted_at.year
       %h4= year
     = render "plantings/tiny",  planting: planting
+
+  - if @finished_plantings.where(planted_at: nil).any?
+    %h4 Unknown year
+    - @finished_plantings.where(planted_at: nil).each do |planting|
+      = render "plantings/tiny",  planting: planting
 - else
   .col-md-12
     %p Nothing has been planted here.

From d81df50dc51ecb729900ce052a9160ae3d8f79bf Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 18:45:11 +1300
Subject: [PATCH 075/142] Suggest companions for a garden based on existing
 crops

---
 app/views/gardens/show.html.haml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index 5ab477951..e883d4314 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -57,6 +57,12 @@
           .col-md-12
             %p Nothing is currently planted here.
 
+    %section.companions
+      %h2 Suggestioned companions
+      - @garden.plantings.each do |planting|
+        - planting.crop.companions.approved.each do |companion|
+          = render 'crops/tiny', crop: companion
+
     %section= render 'previously'
 
   .col-md-3

From c19d09bb3754b733c0e42261e9ea712439fa57ae Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 18:30:05 +1300
Subject: [PATCH 076/142] Switch from unicorn to puma

---
 Procfile       |  2 +-
 config/puma.rb | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Procfile b/Procfile
index 9c8237414..528ca4bfb 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec puma -C config/puma.rb
\ No newline at end of file
diff --git a/config/puma.rb b/config/puma.rb
index a5eccf816..bcf8670ad 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,19 +1,24 @@
+# frozen_string_literal: true
+
+# Overview of config:
+# https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server
+
 # Puma can serve each request in a thread from an internal thread pool.
 # The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }
 threads threads_count, threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
-port        ENV.fetch("PORT") { 3000 }
+port        ENV.fetch('PORT') { 3000 }
 
 # Specifies the `environment` that Puma will run in.
 #
-environment ENV.fetch("RAILS_ENV") { "development" }
+environment ENV.fetch('RAILS_ENV') { 'development' }
 
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked webserver processes. If using threads and workers together
@@ -21,14 +26,20 @@ environment ENV.fetch("RAILS_ENV") { "development" }
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
 #
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+workers ENV.fetch('WEB_CONCURRENCY') { 2 }
 
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code
 # before forking the application. This takes advantage of Copy On Write
 # process behavior so workers use less memory.
 #
-# preload_app!
+preload_app!
+
+on_worker_boot do
+  # Worker specific setup for Rails 4.1+
+  # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
+  ActiveRecord::Base.establish_connection
+end
 
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart

From 4af89d2b2c21b9f0f17d447f5fb1b6fd347633aa Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 22 Apr 2019 20:06:14 +1200
Subject: [PATCH 077/142] Change reminder email into monthly summary

---
 app/mailers/notifier.rb                       |  26 ++-
 .../notifier/planting_reminder.html.haml      |  77 +++----
 lib/tasks/growstuff.rake                      | 208 +-----------------
 3 files changed, 62 insertions(+), 249 deletions(-)

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index e39ced825..3a36a4538 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -25,15 +25,35 @@ class Notifier < ApplicationMailer
 
   def planting_reminder(member)
     @member = member
+    @sitename = ENV['GROWSTUFF_SITE_NAME']
 
-    @plantings = @member.plantings.order(planted_at: :desc).first(5)
-    @harvests = @member.harvests.order(harvested_at: :desc).first(5)
+    @late = []
+    @super_late = []
+    @harvesting = []
+    @others = []
+
+    @member.plantings.active.each do |planting|
+      if planting.finish_is_predicatable?
+        if planting.super_late?
+          @super_late << planting
+        elsif planting.late?
+          @late << planting
+        elsif planting.harvest_time?
+          @harvesting << planting
+        else
+          @others << planting
+        end
+      else
+        @perenials << planting
+      end
+    end
+    @subject = "Your #{Date.today.strftime("%B %Y")} #{@sitename} progress report"
 
     # Encrypting
     message = { member_id: @member.id, type: :send_planting_reminder }
     @signed_message = verifier.generate(message)
 
-    mail(to: @member.email, subject: "What have you planted lately?") if @member.send_planting_reminder
+    mail(to: @member.email, subject: @subject) if @member.send_planting_reminder
   end
 
   def new_crop_request(member, request)
diff --git a/app/views/notifier/planting_reminder.html.haml b/app/views/notifier/planting_reminder.html.haml
index 8f1ce3d27..5291d56db 100644
--- a/app/views/notifier/planting_reminder.html.haml
+++ b/app/views/notifier/planting_reminder.html.haml
@@ -1,63 +1,52 @@
-- site_name = ENV['GROWSTUFF_SITE_NAME']
 %p Hello #{@member.login_name},
 
-%h2 What's new in your garden?
+%h2 Your #{Date.today.strftime("%B %Y")} #{@sitename} progress report
 
 %p
-
 - if @member.plantings.empty?
   %p
-    #{site_name} lets you track what food you're growing
+    #{@sitename} lets you track what food you're growing
     in your garden and see what other people near you are planting too.
   %p
     = link_to "Get started now", new_planting_url
     by planting your first crop.
 
 - else
-  %p
-    The most recent plantings you've told us about are:
+  - if @harvesting.size.positive?
+    %h4 Congratulations, you have plants ready to harvest
+    %ul
+      - @harvesting.each do |planting|
+        %li= link_to planting.crop, planting
 
-  %ul
-  - @plantings.each do |p|
-    %li
-      = link_to p, planting_url(p)
-      planted
-      = distance_of_time_in_words(p.created_at, Time.zone.now)
-      ago.
+  - if @others.size.positive?
+    %h4 Progress report
+    %ul
+      - @others.each do |planting|
+        %li
+          = link_to planting.crop, planting
+          is #{sprintf '%.0f', planting.percentage_grown}% grown
 
-  %p
-    = link_to "Plant something new", new_planting_url
-    to keep your garden records up to date.
+  - if @late.size.positive?
+    %p
+      These perenial plantings are at the end of their lifecycle.
+      %ul
+        - @late.each do |planting|
+          %li= link_to planting.crop, planting
 
-%h2 Your recent harvests
+  - if @super_late.size.positive?
+    %p
+      We suspect the following plantings finished long ago and no longer need tracking. You can mark them as finished to stop tracking.
+      %ul
+        - @super_late.each do |planting|
+          %li
+            = link_to planting.crop, planting
+            planted on #{planting.planted_at.to_date}
+%p
+  Harvested anything lately?
+  = link_to "Track your harvests here.", new_harvest_url
 
-- if @member.harvests.empty?
-  %p
-    #{site_name} helps you keep track of what you
-    harvest from your garden.  Record what food you've grown
-    and see what other people near you are harvesting, too.
-
-  %p
-    = link_to "Get started now", new_harvest_url
-    by tracking your first harvest.
-
-- else
-  According to our records, the last few things you harvested were:
-
-  %ul
-  - @harvests.each do |h|
-    %li
-      = link_to h, harvest_url(h)
-      harvested
-      = distance_of_time_in_words(h.created_at, Time.zone.now)
-      ago.
-
-  %p
-    Harvested anything else lately?
-    = link_to "Track your harvests here.", new_harvest_url
-
-%h2
-  See you soon on #{site_name}!
+%h4
+  See you soon on #{@sitename}!
 
 = render partial: 'signature'
 
diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake
index d36b7bd95..277762520 100644
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -44,209 +44,13 @@ namespace :growstuff do
 
   task send_planting_reminder: :environment do
     # Heroku scheduler only lets us run things daily, so this checks
-    # whether it's the right day to actually do the deed.
-    # Note that Heroku scheduler runs on UTC.
-    # We'd like to send on Wednesday mornings, US time, which will be
-    # very early Wednesday morning UTC.
-    send_on_day = 3 # wednesday
-    every_n_weeks = 2 # send fortnightly
-
-    if (Time.zone.today.cwday == send_on_day) && (Time.zone.today.cweek % every_n_weeks == 0)
-      Member.confirmed.find_each do |m|
-        Notifier.planting_reminder(m).deliver_now!
+    # Send on the first of the month
+    if (Time.zone.today.day == 1)
+      Member.confirmed.each do |m|
+        if m.send_planting_reminder && m.plantings.active.size > 0
+          Notifier.planting_reminder(m).deliver_now! 
+        end
       end
     end
   end
-
-  desc "Depopulate Null Island"
-  # this fixes up anyone who has erroneously wound up with a 0,0 lat/long
-  task depopulate_null_island: :environment do
-    Member.find_each do |m|
-      if m.location && (m.latitude.nil? && m.longitude.nil?)
-        m.geocode
-        m.save
-      end
-    end
-  end
-
-  desc "One-off tasks needed at various times and kept for posterity"
-  namespace :oneoff do
-    desc "May 2013: replace any empty notification subjects with (no subject)"
-    task empty_subjects: :environment do
-      # this is inefficient as it checks every Notification, but the
-      # site is small and there aren't many of them, so it shouldn't matter
-      # for this one-off script.
-      Notification.all.each do |n|
-        n.replace_blank_subject
-        n.save
-      end
-    end
-
-    desc "May 2013: replace any empty garden names with Garden"
-    task empty_garden_names: :environment do
-      # this is inefficient as it checks every Garden, but the
-      # site is small and there aren't many of them, so it shouldn't matter
-      # for this one-off script.
-      Garden.all.each do |g|
-        if g.name.nil? || g.name =~ /^\s*$/
-          g.name = "Garden"
-          g.save
-        end
-      end
-    end
-
-    desc "July 2013: replace nil seed.tradable_to with nowhere"
-    task tradable_to_nowhere: :environment do
-      Seed.all.each do |s|
-        unless s.tradable_to
-          s.tradable_to = 'nowhere'
-          s.save
-        end
-      end
-    end
-
-    desc "August 2013: set up plantings_count cache on crop"
-    task reset_crop_plantings_count: :environment do
-      Crop.find_each do |c|
-        Crop.reset_counters c.id, :plantings
-      end
-    end
-
-    desc "August 2013: set default creator on existing crops"
-    task set_default_crop_creator: :environment do
-      cropbot = Member.find_by(login_name: "cropbot")
-      raise "cropbot not found: create cropbot member on site or run rake db:seed" unless cropbot
-
-      Crop.find_each do |crop|
-        unless crop.creator
-          crop.creator = cropbot
-          crop.save
-        end
-      end
-      ScientificName.find_each do |sn|
-        unless sn.creator
-          sn.creator = cropbot
-          sn.save
-        end
-      end
-    end
-
-    desc "August 2013: set planting owner"
-    task set_planting_owner: :environment do
-      Planting.find_each do |p|
-        p.owner = p.garden.owner
-        p.save
-      end
-    end
-
-    desc "August 2013: initialize member planting counter"
-    task initialize_member_planting_count: :environment do
-      Member.find_each do |m|
-        Member.reset_counters m.id, :plantings
-      end
-    end
-
-    desc "October 2013: set garden locations to member locations"
-    task initialize_garden_locations: :environment do
-      Member.located.find_each do |m|
-        m.gardens.each do |g|
-          next if g.location.present?
-
-          g.location = m.location
-          g.latitude = m.latitude
-          g.longitude = m.longitude
-          g.save
-        end
-      end
-    end
-
-    desc "October 2013: import initial plant parts"
-    task import_plant_parts: :environment do
-      plant_parts = [
-        'fruit',
-        'flower',
-        'seed',
-        'pod',
-        'leaf',
-        'stem',
-        'bark',
-        'bulb',
-        'root',
-        'tuber',
-        'whole plant',
-        'other'
-      ]
-      plant_parts.each do |pp|
-        PlantPart.find_or_create_by!(name: pp)
-      end
-    end
-
-    desc "July 2014: set planting_count to 0 by default, not nil"
-    task zero_plantings_count: :environment do
-      Crop.find_each do |c|
-        if c.plantings_count.nil?
-          c.plantings_count = 0
-          c.save
-        end
-      end
-    end
-
-    desc "August 2014: fix ping to pint in database"
-    task ping_to_pint: :environment do
-      Harvest.find_each do |h|
-        if h.unit == "ping"
-          h.unit = "pint"
-          h.save
-        end
-      end
-    end
-
-    desc "October 2014: remove unused photos"
-    task remove_unused_photos: :environment do
-      Photo.find_each(&:destroy_if_unused)
-    end
-
-    desc "October 2014: generate crops_posts records for existing posts"
-    task generate_crops_posts_records: :environment do
-      Post.find_each(&:save)
-    end
-
-    desc "October 2014: add alternate names for crops"
-    task add_alternate_names: :environment do
-      require 'csv'
-      file = "db/seeds/alternate_names_201410.csv"
-      puts "Loading alternate names from #{file}..."
-      cropbot = Member.find_by(login_name: "cropbot")
-      CSV.foreach(file) do |row|
-        _crop_id, crop_name, alternate_names = row
-        next if alternate_names.blank?
-
-        crop = Crop.find_by(name: crop_name)
-        if crop
-          alternate_names.split(/,\s*/).each do |an|
-            AlternateName.where(
-              name:    an,
-              crop_id: crop.id
-            ).first_or_create do |x|
-              x.creator = cropbot
-            end
-          end
-        end
-      end
-    end
-
-    desc "January 2015: fill in si_weight column"
-    task populate_si_weight: :environment do
-      Harvest.find_each do |h|
-        h.set_si_weight
-        h.save
-      end
-    end
-
-    desc "January 2015: build Elasticsearch index"
-    task elasticsearch_create_index: :environment do
-      Crop.__elasticsearch__.create_index! force: true
-      Crop.import
-    end
-  end # end oneoff section
 end

From e0dc38e7a3994dadfc1e64ae77682f4d1278a61b Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 19 Oct 2019 15:07:49 +1300
Subject: [PATCH 078/142] add perennials

---
 app/mailers/notifier.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 3a36a4538..aec770bd9 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -31,6 +31,7 @@ class Notifier < ApplicationMailer
     @super_late = []
     @harvesting = []
     @others = []
+    @perennials = []
 
     @member.plantings.active.each do |planting|
       if planting.finish_is_predicatable?
@@ -44,9 +45,10 @@ class Notifier < ApplicationMailer
           @others << planting
         end
       else
-        @perenials << planting
+        @perennials << planting
       end
     end
+
     @subject = "Your #{Date.today.strftime("%B %Y")} #{@sitename} progress report"
 
     # Encrypting

From 94452ee62eb1c38f508c8bc9cb9aaf3d8eb7493f Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 20 Oct 2019 14:12:22 +1300
Subject: [PATCH 079/142] polish up the plantings reminders

---
 app/mailers/notifier.rb                       |  7 +--
 app/models/member.rb                          |  1 +
 app/views/layouts/mailer.html.erb             | 35 +++++++++++-
 app/views/notifier/_planting.haml             |  4 ++
 .../notifier/planting_reminder.html.haml      | 55 ++++++++++++-------
 lib/tasks/growstuff.rake                      |  8 +--
 spec/features/planting_reminder_spec.rb       | 38 ++++++-------
 7 files changed, 97 insertions(+), 51 deletions(-)
 create mode 100644 app/views/notifier/_planting.haml

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index aec770bd9..da8618cf9 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -31,9 +31,8 @@ class Notifier < ApplicationMailer
     @super_late = []
     @harvesting = []
     @others = []
-    @perennials = []
 
-    @member.plantings.active.each do |planting|
+    @member.plantings.active.annual.each do |planting|
       if planting.finish_is_predicatable?
         if planting.super_late?
           @super_late << planting
@@ -44,12 +43,10 @@ class Notifier < ApplicationMailer
         else
           @others << planting
         end
-      else
-        @perennials << planting
       end
     end
 
-    @subject = "Your #{Date.today.strftime("%B %Y")} #{@sitename} progress report"
+    @subject = "Your #{Date.today.strftime('%B %Y')} #{@sitename} progress report"
 
     # Encrypting
     message = { member_id: @member.id, type: :send_planting_reminder }
diff --git a/app/models/member.rb b/app/models/member.rb
index e809c5370..cc86c8b14 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -50,6 +50,7 @@ class Member < ApplicationRecord
   scope :recently_joined, -> { reorder(confirmed_at: :desc) }
   scope :interesting, -> { confirmed.located.recently_signed_in.has_plantings }
   scope :has_plantings, -> { joins(:plantings).group("members.id") }
+  scope :wants_reminders, -> { where(send_planting_reminder: true) }
 
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index cb2589829..eb87fdf68 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -2,7 +2,40 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <style>/* Email styles need to be inline */</style>
+    <style>
+      body {
+        font-family: "Fira Sans", Helvetica, Arial, sans-serif;
+      }
+      img.img-icon {
+        width: 1.2em;
+      }
+      ul {
+        padding: 0.2em;
+      }
+
+      li {
+        border-radius: 0;
+        border-top: 1px solid rgba(0, 0, 0, 0.12);
+        box-shadow: none;
+        display: block;
+        font-size: 0.9375rem;
+        line-height: 1.428572;
+        min-height: 3rem;
+        position: relative;
+      }
+
+      section {
+        margin: .5em 0 0;
+        padding: 0 0 1em;
+      }
+      section h2 {
+        background-color: #5f8e43;
+        color: #ffffff;
+        box-shadow: 1px 1px 1px 1px #c9c0b2;
+        color: $white;
+        padding: .2em;
+      }
+    </style>
   </head>
   <body><%= yield %></body>
 </html>
\ No newline at end of file
diff --git a/app/views/notifier/_planting.haml b/app/views/notifier/_planting.haml
new file mode 100644
index 000000000..badd7d9c0
--- /dev/null
+++ b/app/views/notifier/_planting.haml
@@ -0,0 +1,4 @@
+= link_to planting do
+  - if planting.crop.svg_icon.present?
+    = image_tag crop_url(planting.crop, format: :svg), alt: planting.crop.name, class: 'img-icon'
+  = planting.crop
\ No newline at end of file
diff --git a/app/views/notifier/planting_reminder.html.haml b/app/views/notifier/planting_reminder.html.haml
index 5291d56db..0db599a4d 100644
--- a/app/views/notifier/planting_reminder.html.haml
+++ b/app/views/notifier/planting_reminder.html.haml
@@ -2,48 +2,63 @@
 
 %h2 Your #{Date.today.strftime("%B %Y")} #{@sitename} progress report
 
-%p
 - if @member.plantings.empty?
   %p
     #{@sitename} lets you track what food you're growing
     in your garden and see what other people near you are planting too.
   %p
-    = link_to "Get started now", new_planting_url
-    by planting your first crop.
+    #{link_to "Get started now", new_planting_url} by planting your first crop.
 
 - else
   - if @harvesting.size.positive?
-    %h4 Congratulations, you have plants ready to harvest
-    %ul
-      - @harvesting.each do |planting|
-        %li= link_to planting.crop, planting
+    %section.harvests
+      %h2 Ready to harvest
+      %p Congratulations, you have plants ready to harvest
+      %ul
+        - @harvesting.each do |planting|
+          %li= render 'planting', planting: planting
 
   - if @others.size.positive?
-    %h4 Progress report
-    %ul
-      - @others.each do |planting|
-        %li
-          = link_to planting.crop, planting
-          is #{sprintf '%.0f', planting.percentage_grown}% grown
+    %section.progress
+      %h2 Progress report
+      %ul
+        - @others.each do |planting|
+          %li
+            = render 'planting', planting: planting
+            is #{sprintf '%.0f', planting.percentage_grown}% grown
+            with #{(planting.finish_predicted_at - Time.zone.today).to_i} days to go.
 
   - if @late.size.positive?
-    %p
-      These perenial plantings are at the end of their lifecycle.
+    %section.late
+      %h2 Late
+      %p
+        These plantings are at the end of their lifecycle.
       %ul
         - @late.each do |planting|
-          %li= link_to planting.crop, planting
+          %li= render 'planting', planting: planting
 
   - if @super_late.size.positive?
-    %p
-      We suspect the following plantings finished long ago and no longer need tracking. You can mark them as finished to stop tracking.
+    %section.superlate
+      %h2 Super late
+      %p
+        We suspect the following plantings finished long ago and no longer need tracking. You can mark them as finished to stop tracking.
       %ul
         - @super_late.each do |planting|
           %li
-            = link_to planting.crop, planting
+            = render 'planting', planting: planting
             planted on #{planting.planted_at.to_date}
 %p
   Harvested anything lately?
-  = link_to "Track your harvests here.", new_harvest_url
+  = link_to "Track your harvests here.", new_harvest_url, class: 'btn'
+
+%p
+  Want to track and predit a planting in your garden?
+  = link_to "Add a planting.", new_planting_url, class: 'btn'
+
+%p
+  Track and predict your entire garden, and keep your garden records up to date at
+  = link_to member_gardens_url(@member), class: 'btn' do
+    your garden overview
 
 %h4
   See you soon on #{@sitename}!
diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake
index 277762520..6c185c7bc 100644
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -45,11 +45,9 @@ namespace :growstuff do
   task send_planting_reminder: :environment do
     # Heroku scheduler only lets us run things daily, so this checks
     # Send on the first of the month
-    if (Time.zone.today.day == 1)
-      Member.confirmed.each do |m|
-        if m.send_planting_reminder && m.plantings.active.size > 0
-          Notifier.planting_reminder(m).deliver_now! 
-        end
+    if Time.zone.today.day == 1
+      Member.confirmed.wants_reminders.each do |m|
+        Notifier.planting_reminder(m).deliver_now! unless m.plantings.active.empty?
       end
     end
   end
diff --git a/spec/features/planting_reminder_spec.rb b/spec/features/planting_reminder_spec.rb
index 1b8fe7a37..5caecbc51 100644
--- a/spec/features/planting_reminder_spec.rb
+++ b/spec/features/planting_reminder_spec.rb
@@ -21,45 +21,43 @@ describe "Planting reminder email", :js do
     end
 
     it "doesn't list plantings" do
-      expect(mail).not_to have_content "most recent plantings you've told us about"
+      expect(mail).not_to have_content "Progress report"
     end
   end
 
   context "when member has some plantings" do
     # Bangs are used on the following 2 let blocks in order to ensure that the plantings are present
     # in the database before the email is generated: otherwise, they won't be present in the email.
-    let!(:p1) { create :planting, garden: member.gardens.first, owner: member }
-    let!(:p2) { create :planting, garden: member.gardens.first, owner: member }
+    let!(:p1) { FactoryBot.create :predicatable_planting, planted_at: 10.days.ago, garden: member.gardens.first, owner: member }
+    let!(:p2) { FactoryBot.create :predicatable_planting, planted_at: 30.days.ago, garden: member.gardens.first, owner: member }
 
-    it "lists plantings" do
-      expect(mail).to have_content "most recent plantings you've told us about"
-      expect(mail).to have_link p1.to_s, href: planting_url(p1)
-      expect(mail).to have_link p2.to_s, href: planting_url(p2)
-      expect(mail).to have_content "keep your garden records up to date"
+    describe "lists plantings" do
+      it { expect(mail).to have_content "Progress report" }
+      it { expect(mail).to have_link p1.crop.to_s, href: planting_url(p1) }
+      it { expect(mail).to have_link p2.crop.to_s, href: planting_url(p2) }
+      it { expect(mail).to have_content "keep your garden records up to date" }
     end
   end
 
   context "when member has no harvests" do
-    it "tells you to tracking plantings" do
-      expect(mail).to have_content "Get started now by tracking your first harvest"
-    end
-
     it "doesn't list plantings" do
-      expect(mail).not_to have_content "the last few things you harvested were"
+      expect(mail).not_to have_content "Ready to harvest"
     end
   end
 
   context "when member has some harvests" do
     # Bangs are used on the following 2 let blocks in order to ensure that the plantings are present
     # in the database before the spec is run.
-    let!(:h1) { create :harvest, owner: member }
-    let!(:h2) { create :harvest, owner: member }
+    let!(:p1) { FactoryBot.create :predicatable_planting, garden: member.gardens.first, owner: member, planted_at: 20.days.ago }
+    let!(:p2) { FactoryBot.create :predicatable_planting, garden: member.gardens.first, owner: member }
+    let!(:h1) { FactoryBot.create :harvest, owner: member, planting: p1, harvested_at: 1.day.ago }
+    let!(:h2) { FactoryBot.create :harvest, owner: member, planting: p2, harvested_at: 3.days.ago }
 
-    it "lists harvests" do
-      expect(mail).to have_content "the last few things you harvested were"
-      expect(mail).to have_link h1.to_s, href: harvest_url(h1)
-      expect(mail).to have_link h2.to_s, href: harvest_url(h2)
-      expect(mail).to have_content "Harvested anything else lately?"
+    describe "lists planting that are ready for harvest" do
+      it { expect(mail).to have_content "Ready to harvest" }
+      it { expect(mail).to have_link p1.crop.name, href: planting_url(p1) }
+      it { expect(mail).to have_link p2.crop.name, href: planting_url(p2) }
+      it { expect(mail).to have_content "Harvested anything lately?" }
     end
   end
 end

From ca11792286ef49dc102df5b008aefed83884ff95 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 20 Oct 2019 14:13:30 +1300
Subject: [PATCH 080/142] Only show companions of active plantings

---
 app/controllers/gardens_controller.rb | 7 ++++---
 app/views/gardens/show.html.haml      | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index d6f8680e6..8a39b6dc1 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -17,10 +17,11 @@ class GardensController < ApplicationController
   end
 
   def show
-    @current_plantings = @garden.plantings.current
-      .includes(:crop, :owner)
-      .order(planted_at: :desc)
+    @current_plantings = @garden.plantings.current.includes(:crop, :owner).order(planted_at: :desc)
     @finished_plantings = @garden.plantings.finished.includes(:crop)
+    @suggested_companions = Crop.approved.where(
+      id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id)
+    ).order(:name)
     respond_with(@garden)
   end
 
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index e883d4314..4bd44b740 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -59,9 +59,8 @@
 
     %section.companions
       %h2 Suggestioned companions
-      - @garden.plantings.each do |planting|
-        - planting.crop.companions.approved.each do |companion|
-          = render 'crops/tiny', crop: companion
+      - @suggested_companions.each do |companion|
+        = render 'crops/tiny', crop: companion
 
     %section= render 'previously'
 

From 8c694b3dca70f1774ea2462fd672191a004642fb Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 20 Oct 2019 14:13:30 +1300
Subject: [PATCH 081/142] Only show companions of active plantings

---
 app/controllers/gardens_controller.rb     | 7 ++++---
 app/views/gardens/show.html.haml          | 5 ++---
 spec/views/gardens/show.html.haml_spec.rb | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index d6f8680e6..8a39b6dc1 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -17,10 +17,11 @@ class GardensController < ApplicationController
   end
 
   def show
-    @current_plantings = @garden.plantings.current
-      .includes(:crop, :owner)
-      .order(planted_at: :desc)
+    @current_plantings = @garden.plantings.current.includes(:crop, :owner).order(planted_at: :desc)
     @finished_plantings = @garden.plantings.finished.includes(:crop)
+    @suggested_companions = Crop.approved.where(
+      id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id)
+    ).order(:name)
     respond_with(@garden)
   end
 
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index e883d4314..4bd44b740 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -59,9 +59,8 @@
 
     %section.companions
       %h2 Suggestioned companions
-      - @garden.plantings.each do |planting|
-        - planting.crop.companions.approved.each do |companion|
-          = render 'crops/tiny', crop: companion
+      - @suggested_companions.each do |companion|
+        = render 'crops/tiny', crop: companion
 
     %section= render 'previously'
 
diff --git a/spec/views/gardens/show.html.haml_spec.rb b/spec/views/gardens/show.html.haml_spec.rb
index 29841111f..7535ce8de 100644
--- a/spec/views/gardens/show.html.haml_spec.rb
+++ b/spec/views/gardens/show.html.haml_spec.rb
@@ -6,9 +6,11 @@ describe "gardens/show" do
     controller.stub(:current_user) { @owner }
     @garden = FactoryBot.create(:garden, owner: @owner)
     @planting = FactoryBot.create(:planting, garden: @garden, owner: @garden.owner)
+    @suggested_companions = FactoryBot.create_list :crop, 4
     assign(:garden, @garden)
     assign(:current_plantings, [@planting])
     assign(:finished_plantings, [])
+    assign(:suggested_companions, @suggested_companions)
     render
   end
 

From 498a754eeaf8d7c526a1a1a0de455baf42684bb3 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 21 Oct 2019 14:28:59 +1300
Subject: [PATCH 082/142] update specs for admin roles

---
 spec/views/admin/index_spec.rb                | 4 ++--
 spec/views/admin/newsletter_spec.rb           | 2 +-
 spec/views/admin/roles/edit.html.haml_spec.rb | 3 +--
 spec/views/admin/roles/new.html.haml_spec.rb  | 2 +-
 spec/views/admin/roles/show.html.haml_spec.rb | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/spec/views/admin/index_spec.rb b/spec/views/admin/index_spec.rb
index 7e8c27fdc..e1efb6fbc 100644
--- a/spec/views/admin/index_spec.rb
+++ b/spec/views/admin/index_spec.rb
@@ -9,11 +9,11 @@ describe 'admin/index.html.haml', type: "view" do
   end
 
   it "includes links to manage various things" do
-    assert_select "a", href: roles_path
+    assert_select "a", href: admin_roles_path
     assert_select "a", href: forums_path
   end
 
   it "has a link to newsletter subscribers" do
-    rendered.should have_content "Newsletter subscribers"
+    expeect(rendered).to have_content "Newsletter subscribers"
   end
 end
diff --git a/spec/views/admin/newsletter_spec.rb b/spec/views/admin/newsletter_spec.rb
index 4807aaa8e..fbae64def 100644
--- a/spec/views/admin/newsletter_spec.rb
+++ b/spec/views/admin/newsletter_spec.rb
@@ -11,6 +11,6 @@ describe 'admin/newsletter.html.haml', type: "view" do
   end
 
   it "lists newsletter subscribers by email" do
-    rendered.should have_content @subscriber.email
+    expect(rendered).to have_content @subscriber.email
   end
 end
diff --git a/spec/views/admin/roles/edit.html.haml_spec.rb b/spec/views/admin/roles/edit.html.haml_spec.rb
index 5976faebe..62dfaf3b3 100644
--- a/spec/views/admin/roles/edit.html.haml_spec.rb
+++ b/spec/views/admin/roles/edit.html.haml_spec.rb
@@ -10,8 +10,7 @@ describe "admin/roles/edit" do
   it "renders the edit role form" do
     render
 
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", action: roles_path(@role), method: "post" do
+    assert_select "form", action: admin_roles_path(@role), method: "post" do
       assert_select "input#role_name", name: "role[name]"
       assert_select "textarea#role_description", name: "role[description]"
     end
diff --git a/spec/views/admin/roles/new.html.haml_spec.rb b/spec/views/admin/roles/new.html.haml_spec.rb
index 4b439aded..6c27927f2 100644
--- a/spec/views/admin/roles/new.html.haml_spec.rb
+++ b/spec/views/admin/roles/new.html.haml_spec.rb
@@ -11,7 +11,7 @@ describe "admin/roles/new" do
     render
 
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", action: roles_path, method: "post" do
+    assert_select "form", action: admin_roles_path, method: "post" do
       assert_select "input#role_name", name: "role[name]"
       assert_select "textarea#role_description", name: "role[description]"
     end
diff --git a/spec/views/admin/roles/show.html.haml_spec.rb b/spec/views/admin/roles/show.html.haml_spec.rb
index 23caef8b0..ee0a01c6a 100644
--- a/spec/views/admin/roles/show.html.haml_spec.rb
+++ b/spec/views/admin/roles/show.html.haml_spec.rb
@@ -10,7 +10,7 @@ describe "admin/roles/show" do
   it "renders attributes in <p>" do
     render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    rendered.should match(/Name/)
-    rendered.should match(/MyText/)
+    expect(rendered).to match(/Name/)
+    expect(rendered).to match(/MyText/)
   end
 end

From abd91fa37b39692f9291e23fdbbbb4d030218170 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 21 Oct 2019 14:43:46 +1300
Subject: [PATCH 083/142] Use bang! to indicate method can explode

---
 app/controllers/admin/members_controller.rb | 4 ++--
 app/controllers/admin/roles_controller.rb   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index 5f35a203c..0526a57c0 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -1,6 +1,6 @@
 module Admin
   class MembersController < ApplicationController
-    before_action :admin?
+    before_action :admin!
     load_and_authorize_resource
     respond_to :html
     responders :flash
@@ -34,7 +34,7 @@ module Admin
       params[:q]
     end
 
-    def admin?
+    def admin!
       authorize! :manage, :all
     end
   end
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index d596f6165..d08c292dc 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -1,6 +1,6 @@
 module Admin
   class RolesController < ApplicationController
-    before_action :admin?
+    before_action :admin!
     load_and_authorize_resource
     respond_to :html
     responders :flash
@@ -36,7 +36,7 @@ module Admin
 
     private
 
-    def admin?
+    def admin!
       authorize! :manage, :all
     end
 

From 798883be1c313baee917964e7d18405e3744f770 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 21 Oct 2019 14:45:21 +1300
Subject: [PATCH 084/142] Typo/spelling fix

---
 app/views/notifier/planting_reminder.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/notifier/planting_reminder.html.haml b/app/views/notifier/planting_reminder.html.haml
index 0db599a4d..7bb1174aa 100644
--- a/app/views/notifier/planting_reminder.html.haml
+++ b/app/views/notifier/planting_reminder.html.haml
@@ -52,7 +52,7 @@
   = link_to "Track your harvests here.", new_harvest_url, class: 'btn'
 
 %p
-  Want to track and predit a planting in your garden?
+  Want to track and predict a planting in your garden?
   = link_to "Add a planting.", new_planting_url, class: 'btn'
 
 %p

From 13c024fac9a287471690ed54e3623cebae31d801 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 21 Oct 2019 15:13:47 +1300
Subject: [PATCH 085/142] Fixed typo in spec

---
 spec/views/admin/index_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/views/admin/index_spec.rb b/spec/views/admin/index_spec.rb
index e1efb6fbc..7379519cc 100644
--- a/spec/views/admin/index_spec.rb
+++ b/spec/views/admin/index_spec.rb
@@ -14,6 +14,6 @@ describe 'admin/index.html.haml', type: "view" do
   end
 
   it "has a link to newsletter subscribers" do
-    expeect(rendered).to have_content "Newsletter subscribers"
+    expect(rendered).to have_content "Newsletter subscribers"
   end
 end

From d90a58218a98e9410b2f7bbc7b49d959d6eac08a Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 21 Oct 2019 15:38:46 +1300
Subject: [PATCH 086/142] Remove roles#show

---
 spec/views/admin/roles/show.html.haml_spec.rb | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 spec/views/admin/roles/show.html.haml_spec.rb

diff --git a/spec/views/admin/roles/show.html.haml_spec.rb b/spec/views/admin/roles/show.html.haml_spec.rb
deleted file mode 100644
index ee0a01c6a..000000000
--- a/spec/views/admin/roles/show.html.haml_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'rails_helper'
-
-describe "admin/roles/show" do
-  before do
-    @role = assign(:role, stub_model(Role,
-      name:        "Name",
-      description: "MyText"))
-  end
-
-  it "renders attributes in <p>" do
-    render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    expect(rendered).to match(/Name/)
-    expect(rendered).to match(/MyText/)
-  end
-end

From c6f4eef29108e3a6e580cf5105b99e2820fa0dd1 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 21 Oct 2019 16:22:43 +1300
Subject: [PATCH 087/142] Show more results in searches

---
 app/controllers/crops_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index 4d563ca4c..2dd6a948c 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -51,7 +51,7 @@ class CropsController < ApplicationController
 
     @crops = CropSearchService.search(
       @term, page:           params[:page],
-             per_page:       12,
+             per_page:       36,
              current_member: current_member
     )
     respond_with @crops

From f471913b74aa5b28140728192991da6d5ba3434a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2019 08:09:46 +0000
Subject: [PATCH 088/142] [Security] Bump rubyzip from 1.2.3 to 1.3.0

Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.3 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.3...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5dc18108e..f96300683 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -461,7 +461,7 @@ GEM
     ruby_dep (1.5.0)
     ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
-    rubyzip (1.2.3)
+    rubyzip (1.3.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)

From a4e8cc22344e203ffa410bfa9377a50399a4c8f7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2019 08:14:56 +0000
Subject: [PATCH 089/142] Bump bootstrap_form from 4.2.0 to 4.3.0

Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases)
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f96300683..8377ec3a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,7 @@ GEM
       sassc-rails (>= 2.0.0)
     bootstrap-datepicker-rails (1.8.0.1)
       railties (>= 3.0)
-    bootstrap_form (4.2.0)
+    bootstrap_form (4.3.0)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
     builder (3.2.3)
@@ -146,7 +146,7 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6)
-    crass (1.0.4)
+    crass (1.0.5)
     csv_shaper (1.3.1)
       activesupport (>= 3.0.0)
     dalli (2.7.10)
@@ -175,7 +175,7 @@ GEM
       faraday
       multi_json
     equalizer (0.0.11)
-    erubi (1.8.0)
+    erubi (1.9.0)
     erubis (2.7.0)
     excon (0.64.0)
     execjs (2.7.0)
@@ -310,7 +310,7 @@ GEM
     mini_magick (4.9.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.12.0)
+    minitest (5.12.2)
     moneta (1.0.0)
     multi_json (1.11.3)
     multi_xml (0.6.0)

From b9738c8c0f64af2a96545c27829515082b08390b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2019 18:23:03 +0000
Subject: [PATCH 090/142] Bump will_paginate from 3.1.8 to 3.2.1

Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.1.8 to 3.2.1.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.1.8...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8377ec3a8..aa4c84f87 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -553,7 +553,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    will_paginate (3.1.8)
+    will_paginate (3.2.1)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
     xmlrpc (0.3.0)

From bdbe73ada2baff8f329fbd9f3dcea63803fd2152 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2019 19:52:51 +0000
Subject: [PATCH 091/142] Bump haml_lint from 0.33.0 to 0.34.0

Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.33.0 to 0.34.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.33.0...v0.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index aa4c84f87..3908a4217 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -222,10 +222,9 @@ GEM
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 5.1)
-    haml_lint (0.33.0)
+    haml_lint (0.34.0)
       haml (>= 4.0, < 5.2)
       rainbow
-      rake (>= 10, < 13)
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
     hashie (3.6.0)
@@ -345,8 +344,8 @@ GEM
       omniauth-oauth (~> 1.1)
       rack
     orm_adapter (0.5.0)
-    parallel (1.17.0)
-    parser (2.6.4.1)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     percy-capybara (4.0.2)
     pg (0.21.0)
@@ -509,14 +508,14 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sysexits (1.2.0)
-    temple (0.8.1)
+    temple (0.8.2)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     timecop (0.9.1)
     tins (1.21.0)
     trollop (1.16.2)

From 073cbeaab66d4b00de353d71237744cd7754dcf1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2019 20:36:33 +0000
Subject: [PATCH 092/142] Bump loofah from 2.2.3 to 2.3.0

Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3908a4217..c4ee26ff7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -283,7 +283,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.2.3)
+    loofah (2.3.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)

From 55547d29166899c0319c9fedc3894283a7e64667 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2019 21:13:49 +0000
Subject: [PATCH 093/142] Bump webdrivers from 4.1.2 to 4.1.3

Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.2...v4.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c4ee26ff7..b289fc662 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -541,9 +541,9 @@ GEM
       public_suffix
     warden (1.2.8)
       rack (>= 2.0.6)
-    webdrivers (4.1.2)
+    webdrivers (4.1.3)
       nokogiri (~> 1.6)
-      rubyzip (~> 1.0)
+      rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)

From 00b8f72152e0ea17e57054ff9e31802587e77d69 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2019 21:43:19 +0000
Subject: [PATCH 094/142] Bump faraday from 0.15.4 to 0.17.0

Bumps [faraday](https://github.com/lostisland/faraday) from 0.15.4 to 0.17.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v0.15.4...v0.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b289fc662..c25f1bea3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,7 +186,7 @@ GEM
       railties (>= 4.2.0)
     faker (2.4.0)
       i18n (~> 1.6.0)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
@@ -319,8 +319,8 @@ GEM
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     oauth (0.5.4)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)

From bb18d1dea3382ecdd66a5a5bed5c2ae9b70a339f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 00:06:37 +0000
Subject: [PATCH 095/142] Bump sidekiq from 6.0.0 to 6.0.2

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.0 to 6.0.2.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.0...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c25f1bea3..6d58833b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -407,7 +407,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    redis (4.1.2)
+    redis (4.1.3)
     regexp_parser (1.6.0)
     responders (3.0.0)
       actionpack (>= 5.0)
@@ -490,7 +490,7 @@ GEM
       childprocess (>= 0.5, < 3.0)
       rubyzip (~> 1.2, >= 1.2.2)
     sexp_processor (4.12.1)
-    sidekiq (6.0.0)
+    sidekiq (6.0.2)
       connection_pool (>= 2.2.2)
       rack (>= 2.0.0)
       rack-protection (>= 2.0.0)

From 6d4e68f58d7283efb7579e68699c1df805df4843 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 00:21:01 +0000
Subject: [PATCH 096/142] Bump newrelic_rpm from 6.6.0.358 to 6.7.0.359

Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 6.6.0.358 to 6.7.0.359.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/compare/6.6.0.358...6.7.0.359)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6d58833b2..0cc947055 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -314,7 +314,7 @@ GEM
     multi_json (1.11.3)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    newrelic_rpm (6.6.0.358)
+    newrelic_rpm (6.7.0.359)
     nio4r (2.5.1)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)

From d49a4c8db055c12affd84c7b72b98b589b9e3198 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 00:55:28 +0000
Subject: [PATCH 097/142] Bump scout_apm from 2.6.1 to 2.6.2

Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.6.1...v2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0cc947055..b488485ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -480,7 +480,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (2.6.1)
+    scout_apm (2.6.2)
       parser
     searchkick (4.1.0)
       activemodel (>= 5)

From 09f0ec1dc0ff35027daca8a623e66b3c75dc81b4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 07:34:06 +0000
Subject: [PATCH 098/142] Bump rubocop from 0.74.0 to 0.75.1

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.74.0 to 0.75.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.74.0...v0.75.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b488485ee..838c59a6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -443,7 +443,7 @@ GEM
       parser (~> 2.3)
       rspec (~> 3.0)
       unparser (~> 0.2)
-    rubocop (0.74.0)
+    rubocop (0.75.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)

From f1cc01313f1da3bd196fff21d27297051f8c0115 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 09:47:23 +0000
Subject: [PATCH 099/142] Bump puma from 4.2.0 to 4.2.1

Bumps [puma](https://github.com/puma/puma) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 838c59a6d..64943568a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -315,7 +315,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     newrelic_rpm (6.7.0.359)
-    nio4r (2.5.1)
+    nio4r (2.5.2)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     oauth (0.5.4)
@@ -355,7 +355,7 @@ GEM
     popper_js (1.14.5)
     procto (0.0.3)
     public_suffix (4.0.1)
-    puma (4.2.0)
+    puma (4.2.1)
       nio4r (~> 2.0)
     rack (2.0.7)
     rack-protection (2.0.7)

From 9ae80fbf9d583ee3d67cae7ad62bfadffd34a9ec Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 10:12:24 +0000
Subject: [PATCH 100/142] Bump oj from 3.9.1 to 3.9.2

Bumps [oj](https://github.com/ohler55/oj) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.9.1...v3.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 64943568a..62596046b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -325,7 +325,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.9.1)
+    oj (3.9.2)
     omniauth (1.9.0)
       hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)

From 9eff48160661d4430c7bed56cf13c4490894f7f3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 11:08:44 +0000
Subject: [PATCH 101/142] Bump rubocop-rspec from 1.35.0 to 1.36.0

Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.35.0 to 1.36.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.35.0...v1.36.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 62596046b..053a324ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -453,8 +453,8 @@ GEM
     rubocop-rails (2.3.2)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
-    rubocop-rspec (1.35.0)
-      rubocop (>= 0.60.0)
+    rubocop-rspec (1.36.0)
+      rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     ruby-units (2.3.1)
     ruby_dep (1.5.0)

From ebe3c9c0e657e68a7918ebd0b06d78ff4f71a398 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 12:28:29 +0000
Subject: [PATCH 102/142] Bump faker from 2.4.0 to 2.6.0

Bumps [faker](https://github.com/faker-ruby/faker) from 2.4.0 to 2.6.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.4.0...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 053a324ee..70761b36d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -184,8 +184,8 @@ GEM
     factory_bot_rails (5.1.0)
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
-    faker (2.4.0)
-      i18n (~> 1.6.0)
+    faker (2.6.0)
+      i18n (>= 1.6, < 1.8)
     faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
@@ -242,7 +242,7 @@ GEM
     httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.29)
       activesupport (>= 4.0.2)

From 4fa803a40dec4c9042caec4e68815622a35b0bc0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 13:06:53 +0000
Subject: [PATCH 103/142] Bump listen from 3.1.5 to 3.2.0

Bumps [listen](https://github.com/guard/listen) from 3.1.5 to 3.2.0.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.1.5...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70761b36d..3ee2d6ce2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -279,10 +279,9 @@ GEM
       rails (>= 4.2.0)
     letter_opener (1.7.0)
       launchy (~> 2.2)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.3.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -457,7 +456,6 @@ GEM
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     ruby-units (2.3.1)
-    ruby_dep (1.5.0)
     ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
     rubyzip (1.3.0)

From 9b4ead388b08aeb000ba393e5965e4ef0e35bfe7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 14:17:07 +0000
Subject: [PATCH 104/142] Bump rake from 12.3.3 to 13.0.0

Bumps [rake](https://github.com/ruby/rake) from 12.3.3 to 13.0.0.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rake/compare/v12.3.3...v13.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3ee2d6ce2..805df6de1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -110,8 +110,7 @@ GEM
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     chartkick (3.2.1)
-    childprocess (2.0.0)
-      rake (< 13.0)
+    childprocess (1.0.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     coderay (1.1.2)
@@ -384,8 +383,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
@@ -402,7 +401,7 @@ GEM
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.0)
-    rake (12.3.3)
+    rake (13.0.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)

From b69baa8b22fe7aad563b352fc2dca843b6f2ad32 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 14:58:43 +0000
Subject: [PATCH 105/142] Bump rspec-rails from 3.8.2 to 3.9.0

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 805df6de1..6e0a3f9cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,7 +165,7 @@ GEM
       elasticsearch-transport (= 6.8.0)
     elasticsearch-api (6.8.0)
       multi_json
-    elasticsearch-model (6.0.0)
+    elasticsearch-model (7.0.0)
       activesupport (> 3)
       elasticsearch (> 1)
       hashie
@@ -410,31 +410,31 @@ GEM
     responders (3.0.0)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
     rspec-activemodel-mocks (1.1.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     rspectre (0.0.1)
       anima (~> 0.3)
       concord (~> 0.1)

From 603251de754ead816a9e2baae913f22a6ed9283a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 18:45:24 +0000
Subject: [PATCH 106/142] Bump selenium-webdriver from 3.142.4 to 3.142.6

Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.4 to 3.142.6.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6e0a3f9cc..e5eef7976 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -110,7 +110,7 @@ GEM
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     chartkick (3.2.1)
-    childprocess (1.0.0)
+    childprocess (3.0.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     coderay (1.1.2)
@@ -457,7 +457,7 @@ GEM
     ruby-units (2.3.1)
     ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
-    rubyzip (1.3.0)
+    rubyzip (2.0.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -483,9 +483,9 @@ GEM
       activemodel (>= 5)
       elasticsearch (>= 6)
       hashie
-    selenium-webdriver (3.142.4)
-      childprocess (>= 0.5, < 3.0)
-      rubyzip (~> 1.2, >= 1.2.2)
+    selenium-webdriver (3.142.6)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
     sexp_processor (4.12.1)
     sidekiq (6.0.2)
       connection_pool (>= 2.2.2)

From 9de1d02cb1bf276b71428145bad62cb59a78ac87 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2019 08:08:04 +0000
Subject: [PATCH 107/142] Bump loofah from 2.3.0 to 2.3.1

Bumps [loofah](https://github.com/flavorjones/loofah) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e5eef7976..d98c1a17f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -281,7 +281,7 @@ GEM
     listen (3.2.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.3.0)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)

From 85634fc43b2dec71ef26f96609fa390fb9462df2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2019 08:29:26 +0000
Subject: [PATCH 108/142] Bump factory_bot_rails from 5.1.0 to 5.1.1

Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.1.0...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d98c1a17f..1f5ecf2bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -178,9 +178,9 @@ GEM
     erubis (2.7.0)
     excon (0.64.0)
     execjs (2.7.0)
-    factory_bot (5.1.0)
+    factory_bot (5.1.1)
       activesupport (>= 4.2.0)
-    factory_bot_rails (5.1.0)
+    factory_bot_rails (5.1.1)
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
     faker (2.6.0)

From dc3a730064ab467e83d74c23db6ef994b5101533 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 21 Oct 2019 14:42:35 +1300
Subject: [PATCH 109/142] update spec to use expect syntax

---
 spec/controllers/member_controller_spec.rb | 16 +++---
 spec/controllers/photos_controller_spec.rb | 60 ++++++++++++----------
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/spec/controllers/member_controller_spec.rb b/spec/controllers/member_controller_spec.rb
index 87a95ccb0..5ec80e344 100644
--- a/spec/controllers/member_controller_spec.rb
+++ b/spec/controllers/member_controller_spec.rb
@@ -10,31 +10,31 @@ describe MembersController do
   describe "GET index" do
     it "assigns only confirmed members as @members" do
       get :index, params: {}
-      assigns(:members).should eq([@member])
+      expect(assigns(:members)).to eq([@member])
     end
   end
 
   describe "GET JSON index" do
     it "provides JSON for members" do
       get :index, format: 'json'
-      response.should be_successful
+      expect(response).to be_successful
     end
   end
 
   describe "GET show" do
     it "provides JSON for member profile" do
       get :show, params: { slug: @member.to_param }, format: 'json'
-      response.should be_successful
+      expect(response).to be_successful
     end
 
     it "assigns @twitter_auth" do
       get :show, params: { slug: @member.to_param }
-      assigns(:twitter_auth).should eq(@twitter_auth)
+      expect(assigns(:twitter_auth)).to eq(@twitter_auth)
     end
 
     it "assigns @flickr_auth" do
       get :show, params: { slug: @member.to_param }
-      assigns(:flickr_auth).should eq(@flickr_auth)
+      expect(assigns(:flickr_auth)).to eq(@flickr_auth)
     end
 
     it "doesn't show completely nonsense members" do
@@ -53,9 +53,9 @@ describe MembersController do
     describe "returns an RSS feed" do
       before { get :show, params: { slug: @member.to_param }, format: "rss" }
 
-      it { response.should be_successful }
-      it { response.should render_template("members/show") }
-      it { response.content_type.should eq("application/rss+xml") }
+      it { expect(response).to be_successful }
+      it { expect(response).to render_template("members/show") }
+      it { expect(response.content_type).to eq("application/rss+xml") }
     end
   end
 end
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index d856939cc..7a0e08c7c 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -48,8 +48,8 @@ describe PhotosController do
     describe "planting photos" do
       before { get :new, params: { type: "planting", id: planting.id } }
 
-      it { assigns(:flickr_auth).should be_an_instance_of(Authentication) }
-      it { assigns(:item).should eq planting }
+      it { expect(assigns(:flickr_auth)).to be_an_instance_of(Authentication) }
+      it { expect(assigns(:item)).to eq planting }
       it { expect(flash[:alert]).not_to be_present }
       it { expect(flash[:alert]).not_to be_present }
     end
@@ -57,7 +57,7 @@ describe PhotosController do
     describe "harvest photos" do
       before { get :new, params: { type: "harvest", id: harvest.id } }
 
-      it { assigns(:item).should eq harvest }
+      it { expect(assigns(:item)).to eq harvest }
       it { expect(flash[:alert]).not_to be_present }
     end
 
@@ -79,7 +79,7 @@ describe PhotosController do
                                                            link_url:      "http://example.com")
     end
 
-    let(:member) { FactoryBot.create(:member) }
+    let(:member)   { FactoryBot.create(:member)                                  }
     let(:garden)   { FactoryBot.create(:garden, owner: member)                   }
     let(:planting) { FactoryBot.create(:planting, garden: garden, owner: member) }
     let(:harvest)  { FactoryBot.create(:harvest, owner: member)                  }
@@ -88,13 +88,15 @@ describe PhotosController do
     describe "with valid params" do
       before { controller.stub(:current_member) { member } }
 
-      it "attaches the photo to a planting" do
-        post :create, params: {
-          photo: { source_id: photo.source_id, source: 'flickr' },
-          type: "planting", id: planting.id
-        }
-        expect(flash[:alert]).not_to be_present
-        Photo.last.plantings.first.should eq planting
+      describe "attaches the photo to a planting" do
+        before do
+          post :create, params: {
+            photo: { source_id: photo.source_id, source: 'flickr' },
+            type: "planting", id: planting.id
+          }
+        end
+        it { expect(flash[:alert]).not_to be_present }
+        it { expect(Photo.last.plantings.first).to eq planting }
       end
 
       describe "doesn't attach a photo to a planting twice" do
@@ -117,15 +119,17 @@ describe PhotosController do
         Photo.last.harvests.first.should eq harvest
       end
 
-      it "doesn't attach a photo to a harvest twice" do
-        post :create, params: {
-          photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: harvest.id
-        }
-        post :create, params: {
-          photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: harvest.id
-        }
-        expect(flash[:alert]).not_to be_present
-        Photo.last.harvests.size.should eq 1
+      describe "doesn't attach a photo to a harvest twice" do
+        before do
+          post :create, params: {
+            photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: harvest.id
+          }
+          post :create, params: {
+            photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: harvest.id
+          }
+        end
+        it { expect(flash[:alert]).not_to be_present }
+        it { expect(Photo.last.harvests.size).to eq 1 }
       end
 
       it "doesn't attach photo to a comment" do
@@ -151,12 +155,12 @@ describe PhotosController do
     describe "with matching owners" do
       before { controller.stub(:current_member) { member } }
 
-      it "creates the planting/photo link" do
-        planting = FactoryBot.create(:planting, garden: garden, owner: member)
-        photo = FactoryBot.create(:photo, owner: member)
-        post :create, params: { photo: { source_id: photo.source_id, source: 'flickr' }, type: "planting", id: planting.id }
-        expect(flash[:alert]).not_to be_present
-        expect(Photo.last.plantings.first).to eq planting
+      describe "creates the planting/photo link" do
+        let(:planting) { FactoryBot.create(:planting, garden: garden, owner: member) }
+        let(:photo) { FactoryBot.create(:photo, owner: member) }
+        before { post :create, params: { photo: { source_id: photo.source_id, source: 'flickr' }, type: "planting", id: planting.id } }
+        it { expect(flash[:alert]).not_to be_present }
+        it { expect(Photo.last.plantings.first).to eq planting }
       end
 
       describe "creates the harvest/photo link" do
@@ -181,7 +185,7 @@ describe PhotosController do
             type: "planting", id: another_planting.id
           }
         end.to raise_error(ActiveRecord::RecordInvalid)
-        Photo.last.plantings.first.should_not eq another_planting
+        expect(Photo.last.plantings.first).not_to eq another_planting
       end
 
       it "does not create the harvest/photo link" do
@@ -192,7 +196,7 @@ describe PhotosController do
             photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: another_harvest.id
           }
         end.to raise_error(ActiveRecord::RecordInvalid)
-        Photo.last.harvests.first.should_not eq another_harvest
+        expect(Photo.last.harvests.first).not_to eq another_harvest
       end
     end
   end

From 38713af6033f02f0bd007561654e31f77807b5a0 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Wed, 23 Oct 2019 22:28:50 +1300
Subject: [PATCH 110/142] plantings timeline with icons

---
 app/assets/images/icons/growing.svg     |  1 +
 app/assets/stylesheets/overrides.scss   | 27 ++++++++--
 app/helpers/icons_helper.rb             |  4 ++
 app/views/crops/_predictions.html.haml  | 21 +++-----
 app/views/home/_members.html.haml       |  1 -
 app/views/plantings/_facts.haml         | 71 ++++++++++++-------------
 app/views/plantings/_owner.haml         |  4 +-
 app/views/plantings/_timeline.html.haml | 30 +++++++++++
 app/views/plantings/_timeline_icon.haml | 14 +++++
 app/views/plantings/index.html.haml     |  4 +-
 app/views/plantings/show.html.haml      | 19 ++-----
 11 files changed, 124 insertions(+), 72 deletions(-)
 create mode 100644 app/assets/images/icons/growing.svg
 create mode 100644 app/views/plantings/_timeline.html.haml
 create mode 100644 app/views/plantings/_timeline_icon.haml

diff --git a/app/assets/images/icons/growing.svg b/app/assets/images/icons/growing.svg
new file mode 100644
index 000000000..bfebc1bb5
--- /dev/null
+++ b/app/assets/images/icons/growing.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#8BC34A" d="M30.8,18.2c-2.4,0.7-3.6,3.4-2.1,5.4c-0.9,0.5-2.1,1.6-3.2,3.3c-0.1-4.4,0.3-8.7,1.3-11.8c1.4,1.4,3.1,1.2,4.6-0.1c2.7-2.4,0.3-8.1,1.5-9.9c-1.4,0-6.9,0.5-9.2,3.3c-1.5,1.9-0.9,4.6,1.6,5.1c-1.4,3.4-1.9,8.3-1.9,13.1c-0.8-1.2-1.9-2.4-3.3-3.3c2.8-2.2,2-5.7-0.9-7.2C14.9,13.7,7.8,16.3,6,17c2.6,1.6,2.4,10,7.2,11.6c3.1,1,5.5,0,6.1-3.7c4,2.9,4.7,8.1,4.8,8.2c0.1,0.5,0.5,0.9,1,0.9c0,0,0.1,0,0.1,0c0.5-0.1,0.9-0.5,0.9-1l0,0c0-3.9,1.8-6.1,3.1-7.1c0.1,2.5,1.8,3.5,4.2,3.3c3.9-0.5,5.4-7.1,7.7-8C39.8,20.2,34.6,17.2,30.8,18.2z"/><path fill="#689F38" d="M13.2,28.6C8.4,27,8.6,18.6,6,17c0,0,0,0,0,0c2.3,0.2,5.8,2.1,13.4,6.8c0,0,0,0,0,0C19.1,28.4,16.6,29.7,13.2,28.6z M33.3,29c3.9-0.5,5.4-7.1,7.7-8c0,0,0,0,0,0c-1.8-0.2-5.2,0.7-11.8,3.1c0,0,0,0,0,0C28.6,27.8,30.5,29.3,33.3,29z M31.5,14.9c3.1-3,0.3-8.1,1.5-9.9c0,0,0,0,0,0c-1.5,0.8-3.6,3.2-7.2,8.5c0,0,0,0,0,0C27.3,16.5,29.5,16.6,31.5,14.9z"/><path fill="#795548" d="M9,42h9.7h12.6h4.1h5.2c0.8-0.7,1.4-1.8,1.4-3c0-2.2-1.8-4-4-4c-0.4,0-0.8,0.1-1.2,0.2c-0.6-1.9-2.3-3.2-4.3-3.2c-1.3,0-2.5,0.6-3.3,1.4C28.1,32.5,26.6,32,25,32c-2.1,0-4,0.9-5.3,2.4C19.2,34.2,18.6,34,18,34c-1.1,0-2,0.4-2.7,1.1C14.7,34.4,13.9,34,13,34c-1.4,0-2.5,0.9-2.9,2.2C9.8,36.1,9.4,36,9,36c-1.7,0-3,1.3-3,3S7.3,42,9,42z"/><path fill="#8D6E63" d="M38,40C38,40,38,40,38,40c0-1.7-1.3-3-3-3c-1.5,0-2.7,1.1-2.9,2.4C31.3,38.6,30.2,38,29,38c-1.3,0-2.5,0.7-3.2,1.7c-0.5-1.6-2-2.7-3.8-2.7c-1.1,0-2,0.4-2.7,1.1C18.7,37.4,17.9,37,17,37c-1.4,0-2.5,0.9-2.9,2.2C13.8,39.1,13.4,39,13,39c-1.9,0-3.4,1.3-3.9,3h26h2.1H40C39.8,41,39,40.2,38,40z"/></svg>
\ No newline at end of file
diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index f9d965fec..fdeb45f43 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -68,10 +68,6 @@ section {
     }
   }
 
-  .btn {
-    border: 1px solid $brown;
-  }
-
   .card {
     box-shadow: 1px 3px 3px 1px darken($beige, 20%);
   }
@@ -348,6 +344,29 @@ ul.thumbnail-buttons {
   }
 }
 
+.tint {
+  cursor: pointer;
+  float: left;
+  position: relative;
+}
+
+.tint::before {
+  background: $beige;
+  bottom: 0;
+  content: '';
+  display: block;
+  left: 0;
+  opacity: .7;
+  position: absolute;
+  right: 0;
+  top: 0;
+  transition: background .3s linear;
+}
+
+.tint:hover::before {
+  background: none;
+}
+
 // Overrides applying only to mobile view. This must be at the end of the overrides file.
 // Extra small devices (portrait phones, less than 576px)
 @include media-breakpoint-down(xs) {
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index d5839ed05..e2f49ca7d 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -33,6 +33,10 @@ module IconsHelper
     image_icon 'harvest'
   end
 
+  def growing_icon
+    image_icon 'growing'
+  end
+
   def seed_icon
     image_icon 'seeds'
   end
diff --git a/app/views/crops/_predictions.html.haml b/app/views/crops/_predictions.html.haml
index 456756fe4..d0dc154d4 100644
--- a/app/views/crops/_predictions.html.haml
+++ b/app/views/crops/_predictions.html.haml
@@ -28,31 +28,26 @@
     .card.fact-card
       .card-body.text-center
         %h3 Median lifespan
-        %strong= crop.median_lifespan
+        %strong= crop.median_lifespan / 7
         %i.fas.fa-sun-o.fa-5x.pt-3.amber-text
-        %span days
+        %span #{'week'.pluralize(crop.median_lifespan / 7)}
 
   - if crop.median_days_to_first_harvest.present?
-    .card.fact-card
-      .card-body.text-center
-        %h3 First harvest expected
-        %strong= crop.median_days_to_first_harvest
-        %span days after planting
-
+    = render 'layouts/fact_card',
+      title: 'First harvest expected',
+      value: crop.median_days_to_first_harvest / 7,
+      description: "#{'week'.pluralize(crop.median_days_to_first_harvest / 7)} after planting"
   - if crop.annual? && crop.median_days_to_last_harvest.present?
     = render 'layouts/fact_card',
       title: "Last harvest expected",
-      value: crop.median_days_to_last_harvest,
-      description: "days after planting"
-
+      value: crop.median_days_to_last_harvest / 7,
+      description: "#{'week'.pluralize(crop.median_days_to_last_harvest / 7)} after planting"
   - if crop.height.present?
     = render 'layouts/fact_card',
       title: 'Height', value: "#{crop.height}cm", description: nil
-
   - if crop.spread.present?
     = render 'layouts/fact_card',
       title: 'Spread', value: "#{crop.spread}cm", description: nil
-
   - if crop.row_spacing.present?
     = render 'layouts/fact_card',
       title: 'Row Spacing', value: "#{crop.row_spacing}cm", description: nil
diff --git a/app/views/home/_members.html.haml b/app/views/home/_members.html.haml
index 1dcb960b2..c055ba59a 100644
--- a/app/views/home/_members.html.haml
+++ b/app/views/home/_members.html.haml
@@ -5,6 +5,5 @@
       %h2.text-center= t('.title')
       .index-cards
         = render members
-
     %p.text-right
       = link_to "#{t('.view_all')} »", members_path, class: 'btn btn-block'
diff --git a/app/views/plantings/_facts.haml b/app/views/plantings/_facts.haml
index 4afd14ca7..10a862b07 100644
--- a/app/views/plantings/_facts.haml
+++ b/app/views/plantings/_facts.haml
@@ -7,12 +7,12 @@
           = seed_icon
       %span=planting.parent_seed
 
-  - if planting.planted_at.present?
-    .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
-      %h3 Planted
-      %strong.plantingfact--plantedmonth
-        = I18n.t('date.abbr_month_names')[planting.planted_at.month]
-      %span=planting.planted_at.year
+  -# - if planting.planted_at.present?
+  -#   .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
+  -#     %h3 Planted
+  -#     %strong.plantingfact--plantedmonth
+  -#       = I18n.t('date.abbr_month_names')[planting.planted_at.month]
+  -#     %span=planting.planted_at.year
 
   .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
     %h3
@@ -20,14 +20,13 @@
       = editable :date, planting, :planted_at, display_field: '.planted_at'
     %strong.plantingfact--weekssinceplanted.planted_at
       - if planting.planted_at.present?
-        #{planting.weeks_since_planted}
+        -# #{planting.weeks_since_planted}
+        = I18n.t('date.abbr_month_names')[planting.planted_at.month]
       - else
         unknown
-    %span.planted_at weeks ago
     - if planting.planted_at.present?
-      %span.plantingfact--planttedat.planted_at
-        = I18n.l planting.planted_at
-
+      %span.planted_at
+        =planting.planted_at.year
 
 
   .card.fact-card{class: planting.quantity.present? ? '' : 'text-muted'}
@@ -65,15 +64,15 @@
     %span.plantingfact--sunniness
       = planting.sunniness.blank? ? "not specified" : planting.sunniness
 
-  .card.fact-card
-    %h3.plantingfact--harveststitle
-      = planting.finished? ? "Harvested" : "Harvesting"
-    %strong
-      = link_to planting_harvests_path(planting) do
-        = harvest_icon
-    - if planting.first_harvest_date.present? ||  planting.first_harvest_predicted_at.present?
-      %span.plantingfact--harvestprediction
-        = I18n.l(planting.first_harvest_date || planting&.first_harvest_predicted_at || 'unknown')
+  -# .card.fact-card
+  -#   %h3.plantingfact--harveststitle
+  -#     = planting.finished? ? "Harvested" : "Harvesting"
+  -#   %strong
+  -#     = link_to planting_harvests_path(planting) do
+  -#       = harvest_icon
+  -#   - if planting.first_harvest_date.present? ||  planting.first_harvest_predicted_at.present?
+  -#     %span.plantingfact--harvestprediction
+  -#       = I18n.l(planting.first_harvest_date || planting&.first_harvest_predicted_at || 'unknown')
 
   - if planting.crop.perennial
     .card.fact-card
@@ -81,21 +80,21 @@
       %strong=perennial_icon
   - else
     - if !planting.finished? && planting.finish_is_predicatable?
-      .card.fact-card
-        %h3.plantingfact--finishtitle Predicted Finish
-        %strong.plantingfact--finishedmonth
-          = I18n.t('date.abbr_month_names')[planting.finish_predicted_at.month]
-        %span=planting.finish_predicted_at.year
+      -# .card.fact-card
+      -#   %h3.plantingfact--finishtitle Predicted Finish
+      -#   %strong.plantingfact--finishedmonth
+      -#     = I18n.t('date.abbr_month_names')[planting.finish_predicted_at.month]
+      -#   %span=planting.finish_predicted_at.year
 
-      .card.fact-card
-        %h3.plantingfact--finishtitle Predicted Finish
-        - if days_from_now_to_finished(planting).positive?
-          %strong.plantingfact--finisheddays= weeks_from_not_to_finished(planting)
-          %span weeks
-        - else
-          %strong.plantingfact--finisheddays #{weeks_from_not_to_finished(planting) * -1}
-          %span weeks ago
-        %span= I18n.l planting.finish_predicted_at
+      -# .card.fact-card
+      -#   %h3.plantingfact--finishtitle Predicted Finish
+      -#   - if days_from_now_to_finished(planting).positive?
+      -#     %strong.plantingfact--finisheddays= weeks_from_not_to_finished(planting)
+      -#     %span weeks
+      -#   - else
+      -#     %strong.plantingfact--finisheddays #{weeks_from_not_to_finished(planting) * -1}
+      -#     %span weeks ago
+      -#   %span= I18n.l planting.finish_predicted_at
 
   - if planting.child_seeds.size.positive?
     .card.fact-card
@@ -108,8 +107,8 @@
   - if planting.finished?
     .card.fact-card
       %h3 Finished
-      %strong=finished_icon
+      %strong
+        = I18n.t('date.abbr_month_names')[planting.finished_at.month]
       - if planting.finished_at.present?
         %span.plantingfact--finish
-          = I18n.t('date.abbr_month_names')[planting.finished_at.month]
           = planting.finished_at.year
diff --git a/app/views/plantings/_owner.haml b/app/views/plantings/_owner.haml
index a97625dec..89bfcae4d 100644
--- a/app/views/plantings/_owner.haml
+++ b/app/views/plantings/_owner.haml
@@ -1,7 +1,7 @@
 .card
   .card-body
     .row
-      .col-md-6
+      .col
         %h4
           Planted by
           = link_to @planting.owner, @planting.owner
@@ -15,4 +15,4 @@
             %small
               View other plantings, members and more near
               = link_to @planting.owner.location, place_path(@planting.owner.location, anchor: "plantings")
-      .col-md-6= render "members/avatar", member: @planting.owner
\ No newline at end of file
+      .col= render "members/avatar", member: @planting.owner
\ No newline at end of file
diff --git a/app/views/plantings/_timeline.html.haml b/app/views/plantings/_timeline.html.haml
new file mode 100644
index 000000000..a05176517
--- /dev/null
+++ b/app/views/plantings/_timeline.html.haml
@@ -0,0 +1,30 @@
+.jumbotron
+  .d-flex.justify-content-between
+    %h1.display-3
+      = crop_icon(@planting.crop)
+      %strong= @planting.crop.name.titleize
+      %small.text-muted= @planting.crop.default_scientific_name
+    - if @planting.percentage_grown.present?
+      #{@planting.percentage_grown.to_i}%
+  - if @planting.crop.annual? && @planting.expected_lifespan.present?
+    .d-flex.justify-content-between
+      - if @planting.planted_at.present?
+        %p.small #{ image_icon 'planting-hand'} Planted #{I18n.l @planting.planted_at}
+      - if @planting.first_harvest_date.present?
+        %p.small #{harvest_icon} First harvest #{I18n.l @planting.first_harvest_date}
+      - elsif @planting.first_harvest_predicted_at.present?
+        %p.small #{harvest_icon} First harvest expected #{I18n.l @planting.first_harvest_predicted_at}
+      - if @planting.finished_at.present?
+        %p.small #{finished_icon} Finished #{I18n.l @planting.finished_at}
+      - elsif @planting.finish_predicted_at.present?
+        %p.small #{finished_icon} Finish expected #{I18n.l @planting.finish_predicted_at}
+    .progress
+      .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
+    - if @planting.planted_at.present?
+      %ul.list-unstyled.d-flex.justify-content-between
+        - (@planting.expected_lifespan / 7).times do |week_number|
+          %li{class: @planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted tint' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(@planting.planted_at + week_number.weeks)}
+            = render 'timeline_icon', planting: @planting,
+              week_number: week_number, date_this_week: @planting.planted_at + week_number.weeks
+      (One emojii = 1 week)
+
diff --git a/app/views/plantings/_timeline_icon.haml b/app/views/plantings/_timeline_icon.haml
new file mode 100644
index 000000000..9e8a22625
--- /dev/null
+++ b/app/views/plantings/_timeline_icon.haml
@@ -0,0 +1,14 @@
+- if @planting.first_harvest_date.present?
+  - # this planting has harvests
+  - if date_this_week >= @planting.first_harvest_date
+    = crop_icon(@planting.crop)
+  - else
+    = growing_icon
+- elsif @planting.first_harvest_predicted_at.present?
+  - # no harvests yet, so use predicted harvest
+  - if date_this_week < @planting.first_harvest_predicted_at
+    = growing_icon
+  - elsif date_this_week > @planting.first_harvest_predicted_at
+    = crop_icon(@planting.crop)
+- else
+  = week_number
\ No newline at end of file
diff --git a/app/views/plantings/index.html.haml b/app/views/plantings/index.html.haml
index 6e5f53ffe..639840fb3 100644
--- a/app/views/plantings/index.html.haml
+++ b/app/views/plantings/index.html.haml
@@ -12,7 +12,7 @@
   = title('plantings', @owner, @crop, @planting)
 
 .row
-  .col
+  .col-md-6
     %ul.nav
       %li.list-group-item
         = link_to show_inactive_tickbox_path('plantings', owner: @owner, show_all: @show_all) do
@@ -21,7 +21,7 @@
       - if @owner
         %li.list-group-item.btn
           = link_to t('.view_owners_profile', owner: @owner), member_path(@owner)
-  .col= render 'layouts/nav', model: Planting
+  .col-md-6= render 'layouts/nav', model: Planting
 
 .row
   .col-12= page_entries_info @plantings
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index a736dcb67..587cabe23 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -12,16 +12,14 @@
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Plantings', plantings_path
   %li.breadcrumb-item= link_to @planting.owner, member_plantings_path(@planting.owner)
-  %li.breadcrumb-item.active= link_to @planting, @planting
+  %li.breadcrumb-item.active= link_to @planting.crop.name, @planting
 
 .planting
   .row
     .col-md-8.col-xs-12
-      %h1.plantingtitle
-        %span.plantingtitle--icon= planting_icon
-        = @planting.to_s.titleize
+      = render 'timeline', planting: @planting
     .col-md-4.col-xs-12
-      = render 'plantings/actions', planting: @planting
+      = render 'plantings/owner', planting: @planting
 
     .col-md-8.col-xs-12
       %section= render 'facts', planting: @planting
@@ -36,15 +34,8 @@
               #{strip_tags(@planting.description)}
       %section= render 'plantings/photos', photos: @photos, planting: @planting
     .col-md-4.col-xs-12
-      - if @planting.percentage_grown
-        %section.progress-bar
-          %h2 Progress
-          .progress
-            .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
-          %strong.plantingfact--percentagegrown
-            #{sprintf '%.0f', @planting.percentage_grown}%
-
-      = render 'plantings/owner', planting: @planting
+      = render 'plantings/actions', planting: @planting
+      %hr/
       = render @planting.crop
   .row
     .col-md-6

From c094b5daf990ff1b0528a21ce73710624ff7e749 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 18:55:47 +1300
Subject: [PATCH 111/142] Update spec, to look for new emojii timeline

---
 spec/features/plantings/show_spec.rb | 42 ++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/spec/features/plantings/show_spec.rb b/spec/features/plantings/show_spec.rb
index c2e01c0a4..cc369bce5 100644
--- a/spec/features/plantings/show_spec.rb
+++ b/spec/features/plantings/show_spec.rb
@@ -6,37 +6,57 @@ describe "Display a planting", :js, :elasticsearch do
 
   context 'Perennial planted long ago' do
     let(:planting) { FactoryBot.create :perennial_planting }
-    it { expect(find('.plantingfact--perennial')).to have_text 'Perennial' }
-    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
+    it { expect(page).to have_text 'Perennial' }
   end
 
   context 'Perennial finished' do
     let(:planting) { FactoryBot.create :perennial_planting, planted_at: 6.years.ago, finished: true, finished_at: 1.year.ago }
-    it { expect(find('.plantingfact--perennial')).to have_text 'Perennial' }
-    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvested' }
+    it { expect(page).to have_text 'Perennial' }
   end
 
   context 'Annual no predictions' do
     let(:planting) { FactoryBot.create :annual_planting }
-    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
+    it { expect(page).not_to have_text 'Finish expected' }
   end
 
   context 'Annual with predicted finish' do
     let(:planting) { FactoryBot.create :predicatable_planting, planted_at: 2.weeks.ago }
-    it { expect(find('.plantingfact--weekssinceplanted')).to have_text '2' }
-    it { expect(find('.plantingfact--percentagegrown')).to have_text '28%' }
-    it { expect(find('.plantingfact--planttedat')).to have_text I18n.l(2.weeks.ago.to_date) }
-    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
+    it { expect(page).to have_text '28%' }
+    it { expect(page).to have_text "Planted #{I18n.l(2.weeks.ago.to_date)}" }
+    it { expect(page).to have_text 'Finish expected' }
   end
 
   context 'Annual finished' do
     let(:planting) { FactoryBot.create :annual_planting, planted_at: 100.days.ago, finished: true, finished_at: 1.day.ago }
-    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvested' }
+    it { expect(page).to have_text "Planted #{I18n.l(planting.planted_at)}" }
+  end
+
+  context 'Planting with harvests' do
+    let(:planting) { FactoryBot.create(:harvest_with_planting).planting }
+    it { expect(page).to have_text 'Harvest started' }
+  end
+
+  context 'Planting with harvest predictable' do
+    let(:planting) do
+      crop = FactoryBot.create :annual_crop
+      # 50 days to harvest
+      FactoryBot.create(:harvest, harvested_at: 150.days.ago, crop: crop,
+                                  planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
+      # 20 days to harvest
+      FactoryBot.create(:harvest, harvested_at: 180.days.ago, crop: crop,
+                                  planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
+      # 10 days to harvest
+      FactoryBot.create(:harvest, harvested_at: 190.days.ago, crop: crop,
+                                  planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
+      crop.update_medians
+
+      FactoryBot.create :annual_planting, planted_at: 200.days.ago, crop: crop
+    end
+    it { expect(page).to have_text 'First harvest expected' }
   end
 
   context 'with quantity' do
     let(:planting) { FactoryBot.create :planting, quantity: 100 }
     it { expect(find('.plantingfact--quantity')).to have_text '100' }
-    it { expect(find('.plantingfact--harveststitle')).to have_text 'Harvesting' }
   end
 end

From 0cc62c2b98829e26992c4d6fa33ac44bca45256d Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 18:57:16 +1300
Subject: [PATCH 112/142] show planted_at, even when we can't predict finish

---
 app/views/plantings/_timeline.html.haml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/plantings/_timeline.html.haml b/app/views/plantings/_timeline.html.haml
index a05176517..fea3e25d2 100644
--- a/app/views/plantings/_timeline.html.haml
+++ b/app/views/plantings/_timeline.html.haml
@@ -6,21 +6,21 @@
       %small.text-muted= @planting.crop.default_scientific_name
     - if @planting.percentage_grown.present?
       #{@planting.percentage_grown.to_i}%
-  - if @planting.crop.annual? && @planting.expected_lifespan.present?
+  - if @planting.crop.annual?
     .d-flex.justify-content-between
       - if @planting.planted_at.present?
         %p.small #{ image_icon 'planting-hand'} Planted #{I18n.l @planting.planted_at}
       - if @planting.first_harvest_date.present?
-        %p.small #{harvest_icon} First harvest #{I18n.l @planting.first_harvest_date}
+        %p.small #{harvest_icon} Harvest started #{I18n.l @planting.first_harvest_date}
       - elsif @planting.first_harvest_predicted_at.present?
         %p.small #{harvest_icon} First harvest expected #{I18n.l @planting.first_harvest_predicted_at}
       - if @planting.finished_at.present?
         %p.small #{finished_icon} Finished #{I18n.l @planting.finished_at}
       - elsif @planting.finish_predicted_at.present?
         %p.small #{finished_icon} Finish expected #{I18n.l @planting.finish_predicted_at}
-    .progress
-      .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
-    - if @planting.planted_at.present?
+    - if @planting.planted_at.present? && @planting.expected_lifespan.present?
+      .progress
+        .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
       %ul.list-unstyled.d-flex.justify-content-between
         - (@planting.expected_lifespan / 7).times do |week_number|
           %li{class: @planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted tint' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(@planting.planted_at + week_number.weeks)}

From 053a33cd7229abed921e7712faea3c34795840af Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 18:58:50 +1300
Subject: [PATCH 113/142] Removed commented out code

---
 app/views/plantings/_facts.haml | 36 ---------------------------------
 1 file changed, 36 deletions(-)

diff --git a/app/views/plantings/_facts.haml b/app/views/plantings/_facts.haml
index 10a862b07..2660175e4 100644
--- a/app/views/plantings/_facts.haml
+++ b/app/views/plantings/_facts.haml
@@ -7,20 +7,12 @@
           = seed_icon
       %span=planting.parent_seed
 
-  -# - if planting.planted_at.present?
-  -#   .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
-  -#     %h3 Planted
-  -#     %strong.plantingfact--plantedmonth
-  -#       = I18n.t('date.abbr_month_names')[planting.planted_at.month]
-  -#     %span=planting.planted_at.year
-
   .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
     %h3
       Planted
       = editable :date, planting, :planted_at, display_field: '.planted_at'
     %strong.plantingfact--weekssinceplanted.planted_at
       - if planting.planted_at.present?
-        -# #{planting.weeks_since_planted}
         = I18n.t('date.abbr_month_names')[planting.planted_at.month]
       - else
         unknown
@@ -28,7 +20,6 @@
       %span.planted_at
         =planting.planted_at.year
 
-
   .card.fact-card{class: planting.quantity.present? ? '' : 'text-muted'}
     %h3
       Quantity
@@ -64,37 +55,10 @@
     %span.plantingfact--sunniness
       = planting.sunniness.blank? ? "not specified" : planting.sunniness
 
-  -# .card.fact-card
-  -#   %h3.plantingfact--harveststitle
-  -#     = planting.finished? ? "Harvested" : "Harvesting"
-  -#   %strong
-  -#     = link_to planting_harvests_path(planting) do
-  -#       = harvest_icon
-  -#   - if planting.first_harvest_date.present? ||  planting.first_harvest_predicted_at.present?
-  -#     %span.plantingfact--harvestprediction
-  -#       = I18n.l(planting.first_harvest_date || planting&.first_harvest_predicted_at || 'unknown')
-
   - if planting.crop.perennial
     .card.fact-card
       %h3.plantingfact--perennial Perennial
       %strong=perennial_icon
-  - else
-    - if !planting.finished? && planting.finish_is_predicatable?
-      -# .card.fact-card
-      -#   %h3.plantingfact--finishtitle Predicted Finish
-      -#   %strong.plantingfact--finishedmonth
-      -#     = I18n.t('date.abbr_month_names')[planting.finish_predicted_at.month]
-      -#   %span=planting.finish_predicted_at.year
-
-      -# .card.fact-card
-      -#   %h3.plantingfact--finishtitle Predicted Finish
-      -#   - if days_from_now_to_finished(planting).positive?
-      -#     %strong.plantingfact--finisheddays= weeks_from_not_to_finished(planting)
-      -#     %span weeks
-      -#   - else
-      -#     %strong.plantingfact--finisheddays #{weeks_from_not_to_finished(planting) * -1}
-      -#     %span weeks ago
-      -#   %span= I18n.l planting.finish_predicted_at
 
   - if planting.child_seeds.size.positive?
     .card.fact-card

From 1a0e30491f7c57c5579a296ccc9b70d692c13984 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 19:04:37 +1300
Subject: [PATCH 114/142] Removed unused methods

---
 app/helpers/plantings_helper.rb         | 8 --------
 app/models/concerns/predict_planting.rb | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/app/helpers/plantings_helper.rb b/app/helpers/plantings_helper.rb
index 2c28eda76..4de9102ed 100644
--- a/app/helpers/plantings_helper.rb
+++ b/app/helpers/plantings_helper.rb
@@ -29,10 +29,6 @@ module PlantingsHelper
     end
   end
 
-  def weeks_from_not_to_finished(planting)
-    days_from_now_to_finished(planting) / 7
-  end
-
   def days_from_now_to_finished(planting)
     return unless planting.finish_is_predicatable?
 
@@ -45,10 +41,6 @@ module PlantingsHelper
     (planting.first_harvest_predicted_at - Time.zone.today).to_i
   end
 
-  def weeks_from_now_to_first_harvest(planting)
-    days_from_now_to_first_harvest(planting) / 7
-  end
-
   def days_from_now_to_last_harvest(planting)
     return unless planting.planted_at.present? && planting.last_harvest_predicted_at.present?
 
diff --git a/app/models/concerns/predict_planting.rb b/app/models/concerns/predict_planting.rb
index 052f7ed55..e02fe5e5b 100644
--- a/app/models/concerns/predict_planting.rb
+++ b/app/models/concerns/predict_planting.rb
@@ -41,11 +41,6 @@ module PredictPlanting
       (Time.zone.today - planted_at).to_i if planted_at.present?
     end
 
-    def weeks_since_planted
-      days_since_planted / 7
-    end
-
-    # progress
     def percentage_grown
       if finished?
         100

From f4c4e1c93f6cdae63baf5f7cea04307b6322d268 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 19:10:44 +1300
Subject: [PATCH 115/142] Collapse crop card content

---
 app/views/crops/_crop.html.haml | 46 +++++++++++++++++----------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/views/crops/_crop.html.haml b/app/views/crops/_crop.html.haml
index 83e82ffb0..96760baea 100644
--- a/app/views/crops/_crop.html.haml
+++ b/app/views/crops/_crop.html.haml
@@ -4,27 +4,29 @@
                           alt: '',
                           class: 'img img-card'),
                           crop
-
   .card-body
-    %h3.card-title= link_to crop, crop
-    %p.crop-sci-name= crop.default_scientific_name
-    - if crop.annual? && crop.median_lifespan.present?
-      %p.card-text
-        Median Lifespan
-        %b= crop.median_lifespan
-        days
-    - unless crop.median_days_to_first_harvest.nil?
-      %p.card-text
-        First harvest expected
-        %b= crop.median_days_to_first_harvest
-        days after planting
+    %h3.card-title
+      %strong= link_to crop, crop
+      = crop.default_scientific_name
+    .d-flex.justify-content-between
+      - if crop.annual? && crop.median_lifespan.present?
+        %p.card-text
+          Median Lifespan
+          %b= crop.median_lifespan
+          days
+      - unless crop.median_days_to_first_harvest.nil?
+        %p.card-text
+          First harvest expected
+          %b= crop.median_days_to_first_harvest
+          days after planting
 
-    - if crop.annual? && crop.median_days_to_last_harvest.present?
-      %p.card-text
-        Last harvest expected
-        %b= crop.median_days_to_last_harvest
-        days after planting
-  - if member_signed_in?
-    .card-footer
-      = crop_plant_button(crop)
-      = crop_save_seeds_button(crop)
+      - if crop.annual? && crop.median_days_to_last_harvest.present?
+        %p.card-text
+          Last harvest expected
+          %b= crop.median_days_to_last_harvest
+          days after planting
+    - if member_signed_in?
+      .card-footer
+        .d-flex.justify-content-between
+          = crop_plant_button(crop)
+          = crop_save_seeds_button(crop)

From dfe533dda1f4095e4427c411da3116529a4c7562 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 19:13:20 +1300
Subject: [PATCH 116/142] DRY and tidy

---
 app/views/plantings/_timeline.html.haml | 49 ++++++++++---------------
 app/views/plantings/show.html.haml      | 12 +++++-
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/app/views/plantings/_timeline.html.haml b/app/views/plantings/_timeline.html.haml
index fea3e25d2..129d3a719 100644
--- a/app/views/plantings/_timeline.html.haml
+++ b/app/views/plantings/_timeline.html.haml
@@ -1,30 +1,21 @@
-.jumbotron
+- if @planting.crop.annual?
   .d-flex.justify-content-between
-    %h1.display-3
-      = crop_icon(@planting.crop)
-      %strong= @planting.crop.name.titleize
-      %small.text-muted= @planting.crop.default_scientific_name
-    - if @planting.percentage_grown.present?
-      #{@planting.percentage_grown.to_i}%
-  - if @planting.crop.annual?
-    .d-flex.justify-content-between
-      - if @planting.planted_at.present?
-        %p.small #{ image_icon 'planting-hand'} Planted #{I18n.l @planting.planted_at}
-      - if @planting.first_harvest_date.present?
-        %p.small #{harvest_icon} Harvest started #{I18n.l @planting.first_harvest_date}
-      - elsif @planting.first_harvest_predicted_at.present?
-        %p.small #{harvest_icon} First harvest expected #{I18n.l @planting.first_harvest_predicted_at}
-      - if @planting.finished_at.present?
-        %p.small #{finished_icon} Finished #{I18n.l @planting.finished_at}
-      - elsif @planting.finish_predicted_at.present?
-        %p.small #{finished_icon} Finish expected #{I18n.l @planting.finish_predicted_at}
-    - if @planting.planted_at.present? && @planting.expected_lifespan.present?
-      .progress
-        .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
-      %ul.list-unstyled.d-flex.justify-content-between
-        - (@planting.expected_lifespan / 7).times do |week_number|
-          %li{class: @planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted tint' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(@planting.planted_at + week_number.weeks)}
-            = render 'timeline_icon', planting: @planting,
-              week_number: week_number, date_this_week: @planting.planted_at + week_number.weeks
-      (One emojii = 1 week)
-
+    - if @planting.planted_at.present?
+      %p.small #{ image_icon 'planting-hand'} Planted #{I18n.l @planting.planted_at}
+    - if @planting.first_harvest_date.present?
+      %p.small #{harvest_icon} Harvest started #{I18n.l @planting.first_harvest_date}
+    - elsif @planting.first_harvest_predicted_at.present?
+      %p.small #{harvest_icon} First harvest expected #{I18n.l @planting.first_harvest_predicted_at}
+    - if @planting.finished_at.present?
+      %p.small #{finished_icon} Finished #{I18n.l @planting.finished_at}
+    - elsif @planting.finish_predicted_at.present?
+      %p.small #{finished_icon} Finish expected #{I18n.l @planting.finish_predicted_at}
+  - if @planting.planted_at.present? && @planting.expected_lifespan.present?
+    .progress
+      .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
+    %ul.list-unstyled.d-flex.justify-content-between
+      - (@planting.expected_lifespan / 7).times do |week_number|
+        %li{class: @planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted tint' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(@planting.planted_at + week_number.weeks)}
+          = render 'timeline_icon', planting: @planting,
+            week_number: week_number, date_this_week: @planting.planted_at + week_number.weeks
+    (One emojii = 1 week)
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index 587cabe23..57701f27b 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -17,14 +17,22 @@
 .planting
   .row
     .col-md-8.col-xs-12
-      = render 'timeline', planting: @planting
+      .jumbotron
+        .d-flex.justify-content-between
+          %h1.display-3
+            = crop_icon(@planting.crop)
+            %strong= @planting.crop.name.titleize
+            %small.text-muted= @planting.crop.default_scientific_name
+          - if @planting.percentage_grown.present?
+            #{@planting.percentage_grown.to_i}%
+        = render 'timeline', planting: @planting
+
     .col-md-4.col-xs-12
       = render 'plantings/owner', planting: @planting
 
     .col-md-8.col-xs-12
       %section= render 'facts', planting: @planting
       - if @planting.description.present?
-        %hr/
         = cute_icon
         .card
           .card-header

From a1479c9126d471b89021974019c97f31a157cdf3 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 19:13:41 +1300
Subject: [PATCH 117/142] fixed call to missing method

---
 app/views/plantings/_badges.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/plantings/_badges.html.haml b/app/views/plantings/_badges.html.haml
index 9d24a054e..73706feaf 100644
--- a/app/views/plantings/_badges.html.haml
+++ b/app/views/plantings/_badges.html.haml
@@ -15,4 +15,4 @@
           = t('label.harvesting_now')
       - elsif planting.before_harvest_time?
         %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted weeks until harvest'}
-          = t('label.weeks_until_harvest', number: weeks_from_now_to_first_harvest(planting))
+          = t('label.weeks_until_harvest', number: days_from_now_to_first_harvest(planting) / 7)

From f7f3ac695f29966c45ff71802b1663f8ba44264a Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 19:16:41 +1300
Subject: [PATCH 118/142] better name for css class progress-fade

---
 app/assets/stylesheets/overrides.scss   | 6 +++---
 app/views/plantings/_timeline.html.haml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index fdeb45f43..087dcd4d5 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -344,13 +344,13 @@ ul.thumbnail-buttons {
   }
 }
 
-.tint {
+.progress-fade {
   cursor: pointer;
   float: left;
   position: relative;
 }
 
-.tint::before {
+.progress-fade::before {
   background: $beige;
   bottom: 0;
   content: '';
@@ -363,7 +363,7 @@ ul.thumbnail-buttons {
   transition: background .3s linear;
 }
 
-.tint:hover::before {
+.progress-fade:hover::before {
   background: none;
 }
 
diff --git a/app/views/plantings/_timeline.html.haml b/app/views/plantings/_timeline.html.haml
index 129d3a719..2ea0bdabf 100644
--- a/app/views/plantings/_timeline.html.haml
+++ b/app/views/plantings/_timeline.html.haml
@@ -15,7 +15,7 @@
       .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
     %ul.list-unstyled.d-flex.justify-content-between
       - (@planting.expected_lifespan / 7).times do |week_number|
-        %li{class: @planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted tint' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(@planting.planted_at + week_number.weeks)}
+        %li{class: @planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted progress-fade' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(@planting.planted_at + week_number.weeks)}
           = render 'timeline_icon', planting: @planting,
             week_number: week_number, date_this_week: @planting.planted_at + week_number.weeks
     (One emojii = 1 week)

From 5d4f1abacde70e3a536fe808e3e31f48a78b9d9d Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 19:44:58 +1300
Subject: [PATCH 119/142] show unknown date when unknown finish date

---
 app/views/plantings/_facts.haml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/plantings/_facts.haml b/app/views/plantings/_facts.haml
index 2660175e4..c9effc16d 100644
--- a/app/views/plantings/_facts.haml
+++ b/app/views/plantings/_facts.haml
@@ -72,7 +72,10 @@
     .card.fact-card
       %h3 Finished
       %strong
-        = I18n.t('date.abbr_month_names')[planting.finished_at.month]
+        - if planting.finished_at.present?
+          = I18n.t('date.abbr_month_names')[planting.finished_at.month]
+        - else
+          unknown date
       - if planting.finished_at.present?
         %span.plantingfact--finish
           = planting.finished_at.year

From 329262e2f5840d5bda837d3bb02496e9270d2d49 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 19:45:08 +1300
Subject: [PATCH 120/142] show "finished" when planting is finished

---
 app/views/plantings/show.html.haml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index 57701f27b..83910a44b 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -23,7 +23,9 @@
             = crop_icon(@planting.crop)
             %strong= @planting.crop.name.titleize
             %small.text-muted= @planting.crop.default_scientific_name
-          - if @planting.percentage_grown.present?
+          - if @planting.finished?
+            Finished
+          - elsif @planting.percentage_grown.present?
             #{@planting.percentage_grown.to_i}%
         = render 'timeline', planting: @planting
 

From 627d97155f63ff59cd1833b6abb0bc24fe6479c4 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 19:59:18 +1300
Subject: [PATCH 121/142] Tidy up

---
 app/views/plantings/_timeline.html.haml         | 6 ++++--
 spec/features/plantings/planting_a_crop_spec.rb | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/plantings/_timeline.html.haml b/app/views/plantings/_timeline.html.haml
index 2ea0bdabf..3ea636832 100644
--- a/app/views/plantings/_timeline.html.haml
+++ b/app/views/plantings/_timeline.html.haml
@@ -16,6 +16,8 @@
     %ul.list-unstyled.d-flex.justify-content-between
       - (@planting.expected_lifespan / 7).times do |week_number|
         %li{class: @planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted progress-fade' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(@planting.planted_at + week_number.weeks)}
-          = render 'timeline_icon', planting: @planting,
-            week_number: week_number, date_this_week: @planting.planted_at + week_number.weeks
+          = render 'timeline_icon',
+            planting: @planting,
+            week_number: week_number,
+            date_this_week: @planting.planted_at + week_number.weeks
     (One emojii = 1 week)
diff --git a/spec/features/plantings/planting_a_crop_spec.rb b/spec/features/plantings/planting_a_crop_spec.rb
index b6eb4fe76..cd6fb2b3a 100644
--- a/spec/features/plantings/planting_a_crop_spec.rb
+++ b/spec/features/plantings/planting_a_crop_spec.rb
@@ -116,7 +116,7 @@ describe "Planting a crop", :js, :elasticsearch do
 
         expect(page).to have_content "planting was successfully created"
         expect(page).not_to have_content "0%"
-        expect(page).not_to have_content "Finished"
+        expect(page).not_to have_content "Finish expected"
         expect(page).not_to have_content "Finishes"
       end
 

From 95ae4d41bad3c02743f03ea8570a8c67081c0334 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 20:58:13 +1300
Subject: [PATCH 122/142] rounding on weeks

---
 app/views/crops/_predictions.html.haml | 12 ++++++------
 app/views/plantings/_badges.html.haml  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/crops/_predictions.html.haml b/app/views/crops/_predictions.html.haml
index d0dc154d4..4523254ce 100644
--- a/app/views/crops/_predictions.html.haml
+++ b/app/views/crops/_predictions.html.haml
@@ -28,20 +28,20 @@
     .card.fact-card
       .card-body.text-center
         %h3 Median lifespan
-        %strong= crop.median_lifespan / 7
+        %strong= (crop.median_lifespan / 7.0).round
         %i.fas.fa-sun-o.fa-5x.pt-3.amber-text
-        %span #{'week'.pluralize(crop.median_lifespan / 7)}
+        %span #{'week'.pluralize((crop.median_lifespan / 7.0).round)}
 
   - if crop.median_days_to_first_harvest.present?
     = render 'layouts/fact_card',
       title: 'First harvest expected',
-      value: crop.median_days_to_first_harvest / 7,
-      description: "#{'week'.pluralize(crop.median_days_to_first_harvest / 7)} after planting"
+      value: (crop.median_days_to_first_harvest / 7.0).round,
+      description: "#{'week'.pluralize((crop.median_days_to_first_harvest / 7.0).round)} after planting"
   - if crop.annual? && crop.median_days_to_last_harvest.present?
     = render 'layouts/fact_card',
       title: "Last harvest expected",
-      value: crop.median_days_to_last_harvest / 7,
-      description: "#{'week'.pluralize(crop.median_days_to_last_harvest / 7)} after planting"
+      value: (crop.median_days_to_last_harvest / 7.0).round,
+      description: "#{'week'.pluralize((crop.median_days_to_last_harvest / 7.0).round)} after planting"
   - if crop.height.present?
     = render 'layouts/fact_card',
       title: 'Height', value: "#{crop.height}cm", description: nil
diff --git a/app/views/plantings/_badges.html.haml b/app/views/plantings/_badges.html.haml
index 73706feaf..164b3b1e6 100644
--- a/app/views/plantings/_badges.html.haml
+++ b/app/views/plantings/_badges.html.haml
@@ -15,4 +15,4 @@
           = t('label.harvesting_now')
       - elsif planting.before_harvest_time?
         %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted weeks until harvest'}
-          = t('label.weeks_until_harvest', number: days_from_now_to_first_harvest(planting) / 7)
+          = t('label.weeks_until_harvest', number: (days_from_now_to_first_harvest(planting) / 7.0).round)

From 358631d0f99dc84e537704efc65113c5e0e3d995 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 20:58:27 +1300
Subject: [PATCH 123/142] update spec to look for weeks

---
 spec/features/crops/crop_detail_page_spec.rb | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb
index 2602673b0..618308086 100644
--- a/spec/features/crops/crop_detail_page_spec.rb
+++ b/spec/features/crops/crop_detail_page_spec.rb
@@ -104,19 +104,19 @@ describe "crop detail page", js: true do
     describe 'with harvest history data' do
       before do
         # 50 days to harvest
-        FactoryBot.create(:harvest, harvested_at: 150.days.ago, crop: planting.crop,
+        FactoryBot.create(:harvest, harvested_at: 150.days.ago, crop: crop,
                                     planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
         # 20 days to harvest
-        FactoryBot.create(:harvest, harvested_at: 180.days.ago, crop: planting.crop,
+        FactoryBot.create(:harvest, harvested_at: 180.days.ago, crop: crop,
                                     planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
         # 10 days to harvest
-        FactoryBot.create(:harvest, harvested_at: 190.days.ago, crop: planting.crop,
+        FactoryBot.create(:harvest, harvested_at: 190.days.ago, crop: crop,
                                     planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
-        planting.crop.update_medians
+        crop.update_medians
       end
 
       it "predicts harvest" do
-        expect(subject).to have_text("First harvest expected 20 days after planting")
+        expect(subject).to have_text("First harvest expected 2 weeks after planting")
       end
     end
   end
@@ -131,16 +131,13 @@ describe "crop detail page", js: true do
     context 'crop is an Annual' do
       let(:crop) { FactoryBot.create(:annual_crop) }
 
-      describe 'with no harvests' do
-      end
-
       describe 'with harvests' do
         include_examples "predicts harvest"
       end
 
       it "predicts lifespan" do
         expect(subject).to have_text "Median lifespan"
-        expect(subject).to have_text "99 days"
+        expect(subject).to have_text "14 weeks"
       end
 
       it "describes Annual crops" do

From 2d6d02d0b32d5ba1c4de86efbe28a2339d9cd7fd Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 21:03:30 +1300
Subject: [PATCH 124/142] added `in_weeks` helper

---
 app/helpers/event_helper.rb             |  4 ++++
 app/views/crops/_crop.html.haml         | 12 ++++++------
 app/views/crops/_predictions.html.haml  | 12 ++++++------
 app/views/plantings/_badges.html.haml   |  2 +-
 app/views/plantings/_timeline.html.haml |  2 +-
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/helpers/event_helper.rb b/app/helpers/event_helper.rb
index 4900c14d1..f2ff4a5fe 100644
--- a/app/helpers/event_helper.rb
+++ b/app/helpers/event_helper.rb
@@ -1,4 +1,8 @@
 module EventHelper
+  def in_weeks(days)
+    (days / 7.0).round
+  end
+
   def event_description(event)
     render "#{event.event_type.pluralize}/description", event_model: resolve_model(event)
   end
diff --git a/app/views/crops/_crop.html.haml b/app/views/crops/_crop.html.haml
index 96760baea..9c763518d 100644
--- a/app/views/crops/_crop.html.haml
+++ b/app/views/crops/_crop.html.haml
@@ -10,20 +10,20 @@
       = crop.default_scientific_name
     .d-flex.justify-content-between
       - if crop.annual? && crop.median_lifespan.present?
-        %p.card-text
+        %p.small
           Median Lifespan
-          %b= crop.median_lifespan
+          %strong= crop.median_lifespan
           days
       - unless crop.median_days_to_first_harvest.nil?
-        %p.card-text
+        %p.small
           First harvest expected
-          %b= crop.median_days_to_first_harvest
+          %strong= crop.median_days_to_first_harvest
           days after planting
 
       - if crop.annual? && crop.median_days_to_last_harvest.present?
-        %p.card-text
+        %p.small
           Last harvest expected
-          %b= crop.median_days_to_last_harvest
+          %strong= crop.median_days_to_last_harvest
           days after planting
     - if member_signed_in?
       .card-footer
diff --git a/app/views/crops/_predictions.html.haml b/app/views/crops/_predictions.html.haml
index 4523254ce..b3ec9489e 100644
--- a/app/views/crops/_predictions.html.haml
+++ b/app/views/crops/_predictions.html.haml
@@ -28,20 +28,20 @@
     .card.fact-card
       .card-body.text-center
         %h3 Median lifespan
-        %strong= (crop.median_lifespan / 7.0).round
+        %strong= in_weeks(crop.median_lifespan)
         %i.fas.fa-sun-o.fa-5x.pt-3.amber-text
-        %span #{'week'.pluralize((crop.median_lifespan / 7.0).round)}
+        %span #{'week'.pluralize(in_weeks(crop.median_lifespan)}
 
   - if crop.median_days_to_first_harvest.present?
     = render 'layouts/fact_card',
       title: 'First harvest expected',
-      value: (crop.median_days_to_first_harvest / 7.0).round,
-      description: "#{'week'.pluralize((crop.median_days_to_first_harvest / 7.0).round)} after planting"
+      value: in_weeks(crop.median_days_to_first_harvest),
+      description: "#{'week'.pluralize(in_weeks(crop.median_days_to_first_harvest))} after planting"
   - if crop.annual? && crop.median_days_to_last_harvest.present?
     = render 'layouts/fact_card',
       title: "Last harvest expected",
-      value: (crop.median_days_to_last_harvest / 7.0).round,
-      description: "#{'week'.pluralize((crop.median_days_to_last_harvest / 7.0).round)} after planting"
+      value: in_weeks(crop.median_days_to_last_harvest),
+      description: "#{'week'.pluralize(in_weeks(crop.median_days_to_last_harvest))} after planting"
   - if crop.height.present?
     = render 'layouts/fact_card',
       title: 'Height', value: "#{crop.height}cm", description: nil
diff --git a/app/views/plantings/_badges.html.haml b/app/views/plantings/_badges.html.haml
index 164b3b1e6..8402aaf36 100644
--- a/app/views/plantings/_badges.html.haml
+++ b/app/views/plantings/_badges.html.haml
@@ -15,4 +15,4 @@
           = t('label.harvesting_now')
       - elsif planting.before_harvest_time?
         %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted weeks until harvest'}
-          = t('label.weeks_until_harvest', number: (days_from_now_to_first_harvest(planting) / 7.0).round)
+          = t('label.weeks_until_harvest', number: in_weeks(days_from_now_to_first_harvest(planting)))
diff --git a/app/views/plantings/_timeline.html.haml b/app/views/plantings/_timeline.html.haml
index 3ea636832..925456c9b 100644
--- a/app/views/plantings/_timeline.html.haml
+++ b/app/views/plantings/_timeline.html.haml
@@ -14,7 +14,7 @@
     .progress
       .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => @planting.percentage_grown, role: "progressbar", style: "width: #{@planting.percentage_grown}%"}
     %ul.list-unstyled.d-flex.justify-content-between
-      - (@planting.expected_lifespan / 7).times do |week_number|
+      - in_weeks(@planting.expected_lifespan).times do |week_number|
         %li{class: @planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted progress-fade' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(@planting.planted_at + week_number.weeks)}
           = render 'timeline_icon',
             planting: @planting,

From d96b30fff86c0724a94600e8145d30922d99d2c9 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Thu, 24 Oct 2019 21:05:03 +1300
Subject: [PATCH 125/142] spec for `in_weeks` method

---
 spec/helpers/event_helper_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/helpers/event_helper_spec.rb b/spec/helpers/event_helper_spec.rb
index 2ed681901..f90a04c11 100644
--- a/spec/helpers/event_helper_spec.rb
+++ b/spec/helpers/event_helper_spec.rb
@@ -44,4 +44,16 @@ RSpec.describe EventHelper, type: :helper do
     it { expect(subject).to eq photo }
     it { expect(event_description(event)).to have_text "took a photo" }
   end
+
+  describe 'in_weeks' do
+    it { expect(in_weeks(14)).to eq 2 }
+    it { expect(in_weeks(15)).to eq 2 }
+    it { expect(in_weeks(16)).to eq 2 }
+    it { expect(in_weeks(17)).to eq 2 }
+    it { expect(in_weeks(18)).to eq 3 }
+    it { expect(in_weeks(19)).to eq 3 }
+    it { expect(in_weeks(20)).to eq 3 }
+    it { expect(in_weeks(21)).to eq 3 }
+    it { expect(in_weeks(22)).to eq 3 }
+  end
 end

From 9d232e26cb17192200f811ba1dd4e29cdb9eb0be Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 25 Oct 2019 06:42:00 +1300
Subject: [PATCH 126/142] Update app/views/crops/_predictions.html.haml

---
 app/views/crops/_predictions.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/crops/_predictions.html.haml b/app/views/crops/_predictions.html.haml
index b3ec9489e..5d58ad2fb 100644
--- a/app/views/crops/_predictions.html.haml
+++ b/app/views/crops/_predictions.html.haml
@@ -30,7 +30,7 @@
         %h3 Median lifespan
         %strong= in_weeks(crop.median_lifespan)
         %i.fas.fa-sun-o.fa-5x.pt-3.amber-text
-        %span #{'week'.pluralize(in_weeks(crop.median_lifespan)}
+        %span #{'week'.pluralize(in_weeks(crop.median_lifespan))}
 
   - if crop.median_days_to_first_harvest.present?
     = render 'layouts/fact_card',

From 8cf5acc30ad3695de5b0fc1330ecd5197e2e2f99 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 25 Oct 2019 07:42:13 +1300
Subject: [PATCH 127/142] Update spec to expect weeks to be rounded

---
 spec/features/crops/crop_detail_page_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb
index 618308086..c06a03de0 100644
--- a/spec/features/crops/crop_detail_page_spec.rb
+++ b/spec/features/crops/crop_detail_page_spec.rb
@@ -116,7 +116,7 @@ describe "crop detail page", js: true do
       end
 
       it "predicts harvest" do
-        expect(subject).to have_text("First harvest expected 2 weeks after planting")
+        expect(subject).to have_text("First harvest expected 3 weeks after planting")
       end
     end
   end

From 66045866b34a66c522d01246f62f4f4a9a04dd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Aubin?= <andre@pandascore.co>
Date: Wed, 23 Oct 2019 17:30:41 +0200
Subject: [PATCH 128/142] Switch to HTTPS for Gravatar urls

---
 app/views/devise/registrations/_edit_profile.html.haml | 2 +-
 spec/factories/member.rb                               | 2 +-
 spec/features/percy/percy_spec.rb                      | 8 ++++----
 spec/helpers/application_helper_spec.rb                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/devise/registrations/_edit_profile.html.haml b/app/views/devise/registrations/_edit_profile.html.haml
index 054570f66..57132d809 100644
--- a/app/views/devise/registrations/_edit_profile.html.haml
+++ b/app/views/devise/registrations/_edit_profile.html.haml
@@ -25,7 +25,7 @@
           %br/
           To change your profile picture, visit
           = succeed "." do
-            = link_to 'gravatar.com', "http://gravatar.com/"
+            = link_to 'gravatar.com', "https://gravatar.com/"
 
   .form-group
     .form-actions.col-md-offset-2.col-md-8
diff --git a/spec/factories/member.rb b/spec/factories/member.rb
index a8ec81024..5e13f31f8 100644
--- a/spec/factories/member.rb
+++ b/spec/factories/member.rb
@@ -7,7 +7,7 @@ FactoryBot.define do
     confirmed_at { Time.zone.now }
     show_email { false }
     bio { 'I love seeds' }
-    preferred_avatar_uri { 'http://www.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
+    preferred_avatar_uri { 'https://www.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
 
     # cropbot is needed for certain tests, eg. Crop.create_from_csv
     factory :cropbot do
diff --git a/spec/features/percy/percy_spec.rb b/spec/features/percy/percy_spec.rb
index 70ce97092..53d1343ac 100644
--- a/spec/features/percy/percy_spec.rb
+++ b/spec/features/percy/percy_spec.rb
@@ -9,10 +9,10 @@ describe 'Test with visual testing', type: :feature, js: true do
   let!(:admin_user) { FactoryBot.create :admin_member, login_name: 'janitor', preferred_avatar_uri: gravatar3 }
   let!(:someone_else) { FactoryBot.create :edinburgh_member, login_name: 'ruby', preferred_avatar_uri: gravatar4 }
 
-  let(:gravatar) { 'http://www.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
-  let(:gravatar2) { 'http://www.gravatar.com/avatar/353d83d3677b142520987e1936fd093c?size=150&default=identicon' }
-  let(:gravatar3) { 'http://www.gravatar.com/avatar/622db62c7beab8d5d8b7a80aa6385b2f?size=150&default=identicon' }
-  let(:gravatar4) { 'http://www.gravatar.com/avatar/7fd767571ff5ceefc7a687a543b2c402?size=150&default=identicon' }
+  let(:gravatar) { 'https://www.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
+  let(:gravatar2) { 'https://www.gravatar.com/avatar/353d83d3677b142520987e1936fd093c?size=150&default=identicon' }
+  let(:gravatar3) { 'https://www.gravatar.com/avatar/622db62c7beab8d5d8b7a80aa6385b2f?size=150&default=identicon' }
+  let(:gravatar4) { 'https://www.gravatar.com/avatar/7fd767571ff5ceefc7a687a543b2c402?size=150&default=identicon' }
 
   let!(:tomato)   { FactoryBot.create :tomato, creator: someone_else }
   let(:plant_part) { FactoryBot.create :plant_part, name: 'fruit' }
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 353e6e9b0..7ef3ee478 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -22,11 +22,11 @@ describe ApplicationHelper do
       end
 
       it 'renders a gravatar uri' do
-        expect(avatar_uri(@member)).to eq 'http://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=150&default=identicon'
+        expect(avatar_uri(@member)).to eq 'https://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=150&default=identicon'
       end
 
       it 'renders a gravatar uri for a given size' do
-        expect(avatar_uri(@member, 456)).to eq 'http://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=456&default=identicon'
+        expect(avatar_uri(@member, 456)).to eq 'https://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=456&default=identicon'
       end
     end
 

From 15608fc86a31a68a2f06fad037107fe3ed8bfecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Aubin?= <andre@pandascore.co>
Date: Wed, 23 Oct 2019 17:36:48 +0200
Subject: [PATCH 129/142] Update Contributors.md

---
 CONTRIBUTORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 1e308c839..7c268fda4 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -89,6 +89,7 @@ submit the change with your pull request.
 - Brandon Baker / [brandonbaker40](https://github.com/brandonbaker40)
 - Alex Darr / [apdarr](https://github.com/apdarr)
 - Taylor William / [bestest-mensch](https://github.com/bestest-mensch)
+- André Aubin / [lambda2](https://github.com/lambda2)
 
 ## Bots
 

From a3fa774d84628b6e7c11a490e2e6529483ccd0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Aubin?= <andre@pandascore.co>
Date: Thu, 24 Oct 2019 16:23:02 +0200
Subject: [PATCH 130/142] Force ssl on gravatar-ultimate gem

---
 app/helpers/application_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 68ee9c7d8..63a4b45c5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -54,7 +54,8 @@ module ApplicationHelper
     end
 
     Gravatar.new(member.email).image_url(size:    size,
-                                         default: :identicon)
+                                         default: :identicon,
+                                         ssl:     true)
   end
 
   # Returns a string with the quantity and the right pluralization for a

From 279d85456b6599a13e403a8859422c4a75eda0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Aubin?= <andre@pandascore.co>
Date: Fri, 25 Oct 2019 01:39:59 +0200
Subject: [PATCH 131/142] Switching gravatar urls to secure subdomain

---
 spec/factories/member.rb                | 2 +-
 spec/features/percy/percy_spec.rb       | 8 ++++----
 spec/helpers/application_helper_spec.rb | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spec/factories/member.rb b/spec/factories/member.rb
index 5e13f31f8..37ed2c185 100644
--- a/spec/factories/member.rb
+++ b/spec/factories/member.rb
@@ -7,7 +7,7 @@ FactoryBot.define do
     confirmed_at { Time.zone.now }
     show_email { false }
     bio { 'I love seeds' }
-    preferred_avatar_uri { 'https://www.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
+    preferred_avatar_uri { 'https://secure.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
 
     # cropbot is needed for certain tests, eg. Crop.create_from_csv
     factory :cropbot do
diff --git a/spec/features/percy/percy_spec.rb b/spec/features/percy/percy_spec.rb
index 53d1343ac..529f8f9a1 100644
--- a/spec/features/percy/percy_spec.rb
+++ b/spec/features/percy/percy_spec.rb
@@ -9,10 +9,10 @@ describe 'Test with visual testing', type: :feature, js: true do
   let!(:admin_user) { FactoryBot.create :admin_member, login_name: 'janitor', preferred_avatar_uri: gravatar3 }
   let!(:someone_else) { FactoryBot.create :edinburgh_member, login_name: 'ruby', preferred_avatar_uri: gravatar4 }
 
-  let(:gravatar) { 'https://www.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
-  let(:gravatar2) { 'https://www.gravatar.com/avatar/353d83d3677b142520987e1936fd093c?size=150&default=identicon' }
-  let(:gravatar3) { 'https://www.gravatar.com/avatar/622db62c7beab8d5d8b7a80aa6385b2f?size=150&default=identicon' }
-  let(:gravatar4) { 'https://www.gravatar.com/avatar/7fd767571ff5ceefc7a687a543b2c402?size=150&default=identicon' }
+  let(:gravatar) { 'https://secure.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
+  let(:gravatar2) { 'https://secure.gravatar.com/avatar/353d83d3677b142520987e1936fd093c?size=150&default=identicon' }
+  let(:gravatar3) { 'https://secure.gravatar.com/avatar/622db62c7beab8d5d8b7a80aa6385b2f?size=150&default=identicon' }
+  let(:gravatar4) { 'https://secure.gravatar.com/avatar/7fd767571ff5ceefc7a687a543b2c402?size=150&default=identicon' }
 
   let!(:tomato)   { FactoryBot.create :tomato, creator: someone_else }
   let(:plant_part) { FactoryBot.create :plant_part, name: 'fruit' }
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 7ef3ee478..ae7230a00 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -22,11 +22,11 @@ describe ApplicationHelper do
       end
 
       it 'renders a gravatar uri' do
-        expect(avatar_uri(@member)).to eq 'https://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=150&default=identicon'
+        expect(avatar_uri(@member)).to eq 'https://secure.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=150&default=identicon'
       end
 
       it 'renders a gravatar uri for a given size' do
-        expect(avatar_uri(@member, 456)).to eq 'https://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=456&default=identicon'
+        expect(avatar_uri(@member, 456)).to eq 'https://secure.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=456&default=identicon'
       end
     end
 

From 42e4d2400430507413322d90fe0622955dd51a57 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2019 08:01:28 +0000
Subject: [PATCH 132/142] Bump sidekiq from 6.0.2 to 6.0.3

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1f5ecf2bc..aefe15b09 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -487,7 +487,7 @@ GEM
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     sexp_processor (4.12.1)
-    sidekiq (6.0.2)
+    sidekiq (6.0.3)
       connection_pool (>= 2.2.2)
       rack (>= 2.0.0)
       rack-protection (>= 2.0.0)

From b24beae9af3bb2ec79cea2398c7f6ec9ed6308f7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2019 08:35:45 +0000
Subject: [PATCH 133/142] Bump chartkick from 3.2.1 to 3.2.2

Bumps [chartkick](https://github.com/ankane/chartkick) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v3.2.1...v3.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index aefe15b09..533a54e8a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,7 +109,7 @@ GEM
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    chartkick (3.2.1)
+    chartkick (3.2.2)
     childprocess (3.0.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)

From 2f2169f89ad5ff3a7ee0cbf6aff2de4361620090 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 28 Oct 2019 22:12:08 +1300
Subject: [PATCH 134/142] tidy up display of seeds

---
 app/views/seeds/_owner.html.haml | 14 ++++-----
 app/views/seeds/show.html.haml   | 49 +++++++++++++-------------------
 2 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/app/views/seeds/_owner.html.haml b/app/views/seeds/_owner.html.haml
index 0dd3f9dda..197082095 100644
--- a/app/views/seeds/_owner.html.haml
+++ b/app/views/seeds/_owner.html.haml
@@ -1,19 +1,17 @@
 .card
   .card-body
     .row
-      .col-md-6
+      .col-md-8
         %h4
-          Planted by
+          Saved by
           = link_to @seed.owner, @seed.owner
         = link_to "view all #{@seed.owner}'s seeds", member_seeds_path(@seed.owner)
 
-        - if @seed.parent_planting.present?
-          %p
-            Collected from
-            = link_to @seed.parent_planting, @seed.parent_planting
+      .col-md-4= render "members/avatar", member: @seed.owner
+    .row
+      .col-12
         - if @seed.owner.location
           %p
             %small
               View other seeds, members and more near
-              = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
-      .col-md-6= render "members/avatar", member: @seed.owner
\ No newline at end of file
+              = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
\ No newline at end of file
diff --git a/app/views/seeds/show.html.haml b/app/views/seeds/show.html.haml
index d2f2a717f..14917dc9e 100644
--- a/app/views/seeds/show.html.haml
+++ b/app/views/seeds/show.html.haml
@@ -17,30 +17,29 @@
 
 .seed
   .row
-    .col-md-8.col-xs-12
-      %h1
-        %span.seedtitle--icon= crop_icon(@seed.crop)
-        %strong
-          %span.seedtitle--owner #{@seed.owner}'s
-          %span.seedtitle--crop #{@seed.crop}
-          seeds
+    .col-md-9.col-12
+      .jumbotron
+        .d-flex.justify-content-between
+          %h1.display-3
+            = crop_icon(@seed.crop)
+            = @seed.crop.name.titleize
+            seeds
+          %span.text-muted= I18n.l @seed.created_at.to_date
         - if @seed.organic != 'unknown'
-          %small.seedtitle--organic= @seed.organic
+          .badge.badge-success.seedtitle--organic= @seed.organic
         - if @seed.gmo != 'unknown'
-          %small.seedtitle--gmo= @seed.gmo
+          .badge.badge-success.seedtitle--gmo= @seed.gmo
         - if @seed.heirloom != 'unknown'
-          %small.seedtitle--heirloom= @seed.heirloom
-        = I18n.l @seed.created_at.to_date
-
-    .col-md-4.col-xs-12
+          .badge.badge-success.seedtitle--heirloom= @seed.heirloom
+        - if @seed.parent_planting
+          %p
+            Saved from planting:
+            = planting_icon
+            = link_to @seed.parent_planting, planting_path(@seed.parent_planting)
       = render 'seeds/actions', seed: @seed
 
-    .col-md-8.col-xs-12
       %section= render 'facts', seed: @seed
-      - if @seed.parent_planting
-        %dt Saved from planting:
-        %dd
-          = link_to @seed.parent_planting, planting_path(@seed.parent_planting)
+
       - unless @seed.description.blank?
         = cute_icon
         .card.seed--description
@@ -64,17 +63,7 @@
       %section.seed-photos
         - @photos.each do |photo|
           = render 'photos/hero', photo: photo
-      %p
-        %small
-          Or
-          = link_to "purchase seeds via Ebay",
-          crop_ebay_seeds_url(@seed.crop), target: "_blank", rel: "noopener noreferrer", class: 'btn'
-      - if @seed.owner.location
-        %p
-          %small
-            View other seeds, members to trade with and more near
-            = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
-    .col-md-4.col-xs-12
+
+    .col-md-3.col-12
       = render 'seeds/owner'
       = render @seed.crop
-

From 2cb438f15ded422dbd8486c4408a64eb7d4faa86 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 29 Oct 2019 07:22:56 +0000
Subject: [PATCH 135/142] Bump rubocop from 0.75.1 to 0.76.0

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.75.1 to 0.76.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.75.1...v0.76.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 533a54e8a..bd632bc8e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -441,7 +441,7 @@ GEM
       parser (~> 2.3)
       rspec (~> 3.0)
       unparser (~> 0.2)
-    rubocop (0.75.1)
+    rubocop (0.76.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)

From b214f7ad8d61c669d47d18395b46ce63c66be5b2 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 1 Nov 2019 13:24:13 +1300
Subject: [PATCH 136/142] linking existing plantings to their parent seeds

---
 app/assets/stylesheets/overrides.scss              |  8 ++++++++
 app/controllers/plantings_controller.rb            |  7 +++++++
 app/controllers/seeds_controller.rb                |  2 +-
 app/views/plantings/_facts.haml                    |  5 +----
 app/views/plantings/_thumbnail.html.haml           |  1 -
 app/views/plantings/show.html.haml                 |  9 +++++++++
 app/views/seeds/_facts.html.haml                   | 14 +++++++++++---
 app/views/seeds/_form.html.haml                    | 14 +++++++++-----
 app/views/seeds/_thumbnail.html.haml               |  5 +++--
 db/migrate/20191029024101_add_saved_at_to_seeds.rb |  5 +++++
 db/schema.rb                                       |  3 ++-
 11 files changed, 56 insertions(+), 17 deletions(-)
 create mode 100644 db/migrate/20191029024101_add_saved_at_to_seeds.rb

diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index 087dcd4d5..5b55739be 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -147,6 +147,14 @@ section {
       height: 50%;
     }
   }
+
+  .thumbnail {
+    height: 100px;
+    img {
+      border-radius: 5px;
+      height: 75px;
+    }
+  }
 }
 
 img.img-cute {
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 09004b823..d96c7f266 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -32,6 +32,7 @@ class PlantingsController < ApplicationController
 
   def show
     @photos = @planting.photos.includes(:owner).order(date_taken: :desc)
+    @matching_seeds = matching_seeds
     respond_with @planting
   end
 
@@ -113,6 +114,12 @@ class PlantingsController < ApplicationController
       .paginate(page: params[:page])
   end
 
+  def matching_seeds
+    Seed.where(crop: @planting.crop, owner: @planting.owner)
+      .where('(finished_at IS NULL OR finished_at >= ?)', @planting.planted_at)
+      .where('(saved_at IS NULL OR saved_at <= ?)', @planting.planted_at)
+  end
+
   def specifics
     if @owner.present?
       "#{@owner.to_param}-"
diff --git a/app/controllers/seeds_controller.rb b/app/controllers/seeds_controller.rb
index 207b8d639..b6457edbf 100644
--- a/app/controllers/seeds_controller.rb
+++ b/app/controllers/seeds_controller.rb
@@ -73,7 +73,7 @@ class SeedsController < ApplicationController
   def seed_params
     params.require(:seed).permit(
       :crop_id, :description, :quantity, :plant_before,
-      :parent_planting_id,
+      :parent_planting_id, :saved_at,
       :days_until_maturity_min, :days_until_maturity_max,
       :organic, :gmo,
       :heirloom, :tradable_to, :slug,
diff --git a/app/views/plantings/_facts.haml b/app/views/plantings/_facts.haml
index c9effc16d..23ade1d2f 100644
--- a/app/views/plantings/_facts.haml
+++ b/app/views/plantings/_facts.haml
@@ -2,10 +2,7 @@
   - if planting.parent_seed
     .card.fact-card
       %h3 Parent seed
-      %strong.plantingfact--parentseed
-        = link_to seed_path(planting.parent_seed) do
-          = seed_icon
-      %span=planting.parent_seed
+      = render 'seeds/thumbnail', seed: planting.parent_seed
 
   .card.fact-card{class: planting.planted_at.present? ? '' : 'text-muted'}
     %h3
diff --git a/app/views/plantings/_thumbnail.html.haml b/app/views/plantings/_thumbnail.html.haml
index aec971fd3..60bf071cf 100644
--- a/app/views/plantings/_thumbnail.html.haml
+++ b/app/views/plantings/_thumbnail.html.haml
@@ -1,5 +1,4 @@
 .card.thumbnail
-  /= render 'plantings/quick_actions', planting: planting
   .planting-thumbnail-image
     = link_to image_tag(planting_image_path(planting),
                         alt: planting.crop, class: 'img-card'),
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index 83910a44b..0ff106ccc 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -27,8 +27,17 @@
             Finished
           - elsif @planting.percentage_grown.present?
             #{@planting.percentage_grown.to_i}%
+
         = render 'timeline', planting: @planting
 
+      - if @planting.parent_seed.nil? && @matching_seeds && @matching_seeds.any? && @planting.owner == current_member
+        .alert.alert-info{role: "alert"}
+          = bootstrap_form_for(@planting) do |f|
+            Is this from one of these plantings?
+            - @matching_seeds.each do |seed|
+              = f.radio_button :parent_seed_id, seed.id, label: seed
+            = f.submit "save", class: 'btn btn-sm'
+
     .col-md-4.col-xs-12
       = render 'plantings/owner', planting: @planting
 
diff --git a/app/views/seeds/_facts.html.haml b/app/views/seeds/_facts.html.haml
index ea155b123..79ffb6860 100644
--- a/app/views/seeds/_facts.html.haml
+++ b/app/views/seeds/_facts.html.haml
@@ -17,9 +17,6 @@
       - else
         Unknown
 
-  -if seed.finished_at.present?
-    .card
-      %h3 Finished at
 
   .card{class: seed.days_until_maturity_max.present? ? '' : 'text-muted'}
     %h3 Days until maturity
@@ -39,3 +36,14 @@
           = link_to "Set Location", edit_registration_path(current_member), class: 'btn btn-default btn-xs'
       - else
         (from #{link_to seed.owner.location, place_path(seed.owner.location, anchor: "seeds")})
+
+  - if seed.finished_at.present? || seed.finished?
+    .card
+      %h3 Finished
+      %strong
+        - if seed.finished_at.present?
+          = I18n.t('date.abbr_month_names')[seed.finished_at.month]
+        -elsif seed.finished?
+          = finished_icon
+      - if seed.finished_at.present?
+        %span= seed.finished_at.year
\ No newline at end of file
diff --git a/app/views/seeds/_form.html.haml b/app/views/seeds/_form.html.haml
index 5d0facb58..62e8033ca 100644
--- a/app/views/seeds/_form.html.haml
+++ b/app/views/seeds/_form.html.haml
@@ -28,17 +28,21 @@
             Can't find what you're looking for?
             = link_to "Request new crops.", new_crop_path
       .row
-        .col-12= f.number_field :quantity, label: 'Quantity'
-        .col-12
+        .col-12.col-md-4
+          = f.text_field :saved_at,
+                     value: @seed.saved_at ? @seed.saved_at.to_s(:ymd) : '',
+                     class: 'add-datepicker', label: 'When were the seeds harvested/saved?'
+        .col-12.col-md-4= f.number_field :quantity, label: 'Quantity'
+        .col-12.col-md-4
           = f.text_field :plant_before, class: 'add-datepicker',
           value: @seed.plant_before ? @seed.plant_before.to_s(:ymd) : ''
 
       .row
-        .col-12
+        .col-12.col-md-4
           = f.check_box :finished, label: 'Mark as finished'
-        .col-12
+        .col-12.col-md-4
           = f.text_field :finished_at, class: 'add-datepicker', value: @seed.finished_at ? @seed.finished_at.to_s(:ymd) : ''
-        .col-12
+        .col-12.col-md-4
           %span.help-inline= t('.finish_helper')
 
       .row
diff --git a/app/views/seeds/_thumbnail.html.haml b/app/views/seeds/_thumbnail.html.haml
index a35937357..0aefcaac8 100644
--- a/app/views/seeds/_thumbnail.html.haml
+++ b/app/views/seeds/_thumbnail.html.haml
@@ -5,5 +5,6 @@
               seed_path(seed)
     .seedinfo
       .seed-name
-        = link_to display_seed_quantity(seed), seed_path(seed)
-  = I18n.l(seed.created_at.to_date)
+        = link_to seed.crop, seed_path(seed)
+- if seed.saved_at.present?
+  %span= I18n.l(seed.saved_at.to_date)
diff --git a/db/migrate/20191029024101_add_saved_at_to_seeds.rb b/db/migrate/20191029024101_add_saved_at_to_seeds.rb
new file mode 100644
index 000000000..745bdf5e4
--- /dev/null
+++ b/db/migrate/20191029024101_add_saved_at_to_seeds.rb
@@ -0,0 +1,5 @@
+class AddSavedAtToSeeds < ActiveRecord::Migration[5.2]
+  def change
+    add_column :seeds, :saved_at, :date
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7f611b3e6..041da08a4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_09_21_211652) do
+ActiveRecord::Schema.define(version: 2019_10_29_024101) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -520,6 +520,7 @@ ActiveRecord::Schema.define(version: 2019_09_21_211652) do
     t.boolean "finished", default: false
     t.date "finished_at"
     t.integer "parent_planting_id"
+    t.date "saved_at"
     t.index ["slug"], name: "index_seeds_on_slug", unique: true
   end
 

From c27622803db6b7add503ffbcaabab62d0ad7cfe3 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 1 Nov 2019 15:34:12 +1300
Subject: [PATCH 137/142] Specs for linking plantings to seeds

---
 spec/features/plantings/show_spec.rb | 126 ++++++++++++++++-----------
 1 file changed, 73 insertions(+), 53 deletions(-)

diff --git a/spec/features/plantings/show_spec.rb b/spec/features/plantings/show_spec.rb
index cc369bce5..9d8450834 100644
--- a/spec/features/plantings/show_spec.rb
+++ b/spec/features/plantings/show_spec.rb
@@ -2,61 +2,81 @@ require "rails_helper"
 require 'custom_matchers'
 
 describe "Display a planting", :js, :elasticsearch do
-  before { visit planting_path(planting) }
+  context 'anonymous' do
+    before { visit planting_path(planting) }
 
-  context 'Perennial planted long ago' do
-    let(:planting) { FactoryBot.create :perennial_planting }
-    it { expect(page).to have_text 'Perennial' }
-  end
-
-  context 'Perennial finished' do
-    let(:planting) { FactoryBot.create :perennial_planting, planted_at: 6.years.ago, finished: true, finished_at: 1.year.ago }
-    it { expect(page).to have_text 'Perennial' }
-  end
-
-  context 'Annual no predictions' do
-    let(:planting) { FactoryBot.create :annual_planting }
-    it { expect(page).not_to have_text 'Finish expected' }
-  end
-
-  context 'Annual with predicted finish' do
-    let(:planting) { FactoryBot.create :predicatable_planting, planted_at: 2.weeks.ago }
-    it { expect(page).to have_text '28%' }
-    it { expect(page).to have_text "Planted #{I18n.l(2.weeks.ago.to_date)}" }
-    it { expect(page).to have_text 'Finish expected' }
-  end
-
-  context 'Annual finished' do
-    let(:planting) { FactoryBot.create :annual_planting, planted_at: 100.days.ago, finished: true, finished_at: 1.day.ago }
-    it { expect(page).to have_text "Planted #{I18n.l(planting.planted_at)}" }
-  end
-
-  context 'Planting with harvests' do
-    let(:planting) { FactoryBot.create(:harvest_with_planting).planting }
-    it { expect(page).to have_text 'Harvest started' }
-  end
-
-  context 'Planting with harvest predictable' do
-    let(:planting) do
-      crop = FactoryBot.create :annual_crop
-      # 50 days to harvest
-      FactoryBot.create(:harvest, harvested_at: 150.days.ago, crop: crop,
-                                  planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
-      # 20 days to harvest
-      FactoryBot.create(:harvest, harvested_at: 180.days.ago, crop: crop,
-                                  planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
-      # 10 days to harvest
-      FactoryBot.create(:harvest, harvested_at: 190.days.ago, crop: crop,
-                                  planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
-      crop.update_medians
-
-      FactoryBot.create :annual_planting, planted_at: 200.days.ago, crop: crop
+    context 'Perennial planted long ago' do
+      let(:planting) { FactoryBot.create :perennial_planting }
+      it { expect(page).to have_text 'Perennial' }
     end
-    it { expect(page).to have_text 'First harvest expected' }
-  end
 
-  context 'with quantity' do
-    let(:planting) { FactoryBot.create :planting, quantity: 100 }
-    it { expect(find('.plantingfact--quantity')).to have_text '100' }
+    context 'Perennial finished' do
+      let(:planting) { FactoryBot.create :perennial_planting, planted_at: 6.years.ago, finished: true, finished_at: 1.year.ago }
+      it { expect(page).to have_text 'Perennial' }
+    end
+
+    context 'Annual no predictions' do
+      let(:planting) { FactoryBot.create :annual_planting }
+      it { expect(page).not_to have_text 'Finish expected' }
+    end
+
+    context 'Annual with predicted finish' do
+      let(:planting) { FactoryBot.create :predicatable_planting, planted_at: 2.weeks.ago }
+      it { expect(page).to have_text '28%' }
+      it { expect(page).to have_text "Planted #{I18n.l(2.weeks.ago.to_date)}" }
+      it { expect(page).to have_text 'Finish expected' }
+    end
+
+    context 'Annual finished' do
+      let(:planting) { FactoryBot.create :annual_planting, planted_at: 100.days.ago, finished: true, finished_at: 1.day.ago }
+      it { expect(page).to have_text "Planted #{I18n.l(planting.planted_at)}" }
+    end
+
+    context 'Planting with harvests' do
+      let(:planting) { FactoryBot.create(:harvest_with_planting).planting }
+      it { expect(page).to have_text 'Harvest started' }
+    end
+
+    context 'Planting with harvest predictable' do
+      let(:planting) do
+        crop = FactoryBot.create :annual_crop
+        # 50 days to harvest
+        FactoryBot.create(:harvest, harvested_at: 150.days.ago, crop: crop,
+                                    planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
+        # 20 days to harvest
+        FactoryBot.create(:harvest, harvested_at: 180.days.ago, crop: crop,
+                                    planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
+        # 10 days to harvest
+        FactoryBot.create(:harvest, harvested_at: 190.days.ago, crop: crop,
+                                    planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
+        crop.update_medians
+
+        FactoryBot.create :annual_planting, planted_at: 200.days.ago, crop: crop
+      end
+      it { expect(page).to have_text 'First harvest expected' }
+    end
+
+    context 'with quantity' do
+      let(:planting) { FactoryBot.create :planting, quantity: 100 }
+      it { expect(find('.plantingfact--quantity')).to have_text '100' }
+    end
+  end
+  context 'signed in' do
+    include_context 'signed in member'
+    before { visit planting_path(planting) }
+
+    context 'with matching seeds' do
+      let(:seed) { FactoryBot.create :seed, saved_at: 1.month.ago, owner: member }
+      let(:planting) { FactoryBot.create :planting, planted_at: 1.day.ago, crop: seed.crop, owner: member }
+      it { expect(page).to have_text 'Is this from one of these plantings? ' }
+      describe 'linking to planting' do
+        before do
+          choose "planting_parent_seed_id_#{planting.id}"
+          click_button 'save'
+        end
+        it { expect(page).to have_text 'Parent seed' }
+        it { expect(page).to have_link href: planting_path(planting) }
+      end
+    end
   end
 end

From d0bee45c0c890956fb018b453a90ac22a5012987 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 1 Nov 2019 17:21:55 +1300
Subject: [PATCH 138/142] show all varieties (including grandchildren)

---
 app/views/crops/_varieties.html.haml |  9 ++++-----
 app/views/crops/show.html.haml       |  7 +++++--
 spec/features/crops/show_spec.rb     | 12 +++++++++++-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/views/crops/_varieties.html.haml b/app/views/crops/_varieties.html.haml
index e4a8b5f22..3f73ed612 100644
--- a/app/views/crops/_varieties.html.haml
+++ b/app/views/crops/_varieties.html.haml
@@ -1,5 +1,4 @@
-- if crop.varieties.size.positive?
-  %h2 Varieties
-  .index-cards
-    - crop.varieties.order(:name).each do |v|
-      = render 'crops/thumbnail', crop: v
\ No newline at end of file
+- if crop.varieties.any?
+  - crop.varieties.order(:name).each do |v|
+    = render 'crops/thumbnail', crop: v
+    = render 'crops/varieties', crop: v
diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index cc9b680fe..75f5b6d7e 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -47,8 +47,11 @@
             %h2 Harvested for
             = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
 
-    %section.varieties
-      = render 'varieties', crop: @crop
+    - if @crop.varieties.any?
+      %section.varieties
+        %h2 Varieties
+        .index-cards
+          = render 'varieties', crop: @crop
 
     %section.crop-map
       %h2
diff --git a/spec/features/crops/show_spec.rb b/spec/features/crops/show_spec.rb
index f6fb15410..48d083257 100644
--- a/spec/features/crops/show_spec.rb
+++ b/spec/features/crops/show_spec.rb
@@ -1,13 +1,23 @@
 require 'rails_helper'
 
 describe "browse crops" do
-  let(:tomato) { create :tomato }
+  let(:tomato) { FactoryBot.create :tomato }
 
   it "Show crop info" do
     visit crop_path(tomato)
     expect(page).to have_text 'tomato'
   end
 
+  describe "shows varieties" do
+    let!(:cherry) { FactoryBot.create :crop, name: 'cherry tomato', parent: tomato }
+    let!(:heirloom) { FactoryBot.create :crop, name: 'heirloom tomato', parent: tomato }
+    let!(:striped) { FactoryBot.create :crop, name: 'striped tomato', parent: heirloom }
+    before { visit crop_path(tomato) }
+    it { expect(page).to have_link heirloom.name, href: crop_path(heirloom) }
+    it { expect(page).to have_link cherry.name, href: crop_path(cherry) }
+    it { expect(page).to have_link striped.name, href: crop_path(striped) }
+  end
+
   context "when the most recently created harvest is not the most recently harvested" do
     before { FactoryBot.create_list :harvest, 20, crop: tomato, harvested_at: 1.year.ago, created_at: 1.minute.ago }
 

From bdfce436b46f8a48209cc72c5820d1510e002759 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2019 07:14:48 +0000
Subject: [PATCH 139/142] Bump scout_apm from 2.6.2 to 2.6.3

Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.6.2...v2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bd632bc8e..10da10c0c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -477,7 +477,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (2.6.2)
+    scout_apm (2.6.3)
       parser
     searchkick (4.1.0)
       activemodel (>= 5)

From e617d2aac9786c112b240169055888d9be2f92c0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2019 08:50:05 +0000
Subject: [PATCH 140/142] Bump faker from 2.6.0 to 2.7.0

Bumps [faker](https://github.com/faker-ruby/faker) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.6.0...v2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 10da10c0c..f04ddc3f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
     factory_bot_rails (5.1.1)
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
-    faker (2.6.0)
+    faker (2.7.0)
       i18n (>= 1.6, < 1.8)
     faraday (0.17.0)
       multipart-post (>= 1.2, < 3)

From 5cb00f442364a5bd4c7a93362bb68e14a5bbb5fb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2019 07:13:37 +0000
Subject: [PATCH 141/142] Bump puma from 4.2.1 to 4.3.0

Bumps [puma](https://github.com/puma/puma) from 4.2.1 to 4.3.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.2.1...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f04ddc3f0..c7f424c68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -353,7 +353,7 @@ GEM
     popper_js (1.14.5)
     procto (0.0.3)
     public_suffix (4.0.1)
-    puma (4.2.1)
+    puma (4.3.0)
       nio4r (~> 2.0)
     rack (2.0.7)
     rack-protection (2.0.7)

From 9b15b42cbdbe63133cf28263a6586e6bdbcc38b9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 10 Nov 2019 02:33:08 +0000
Subject: [PATCH 142/142] [Security] Bump chartkick from 3.2.2 to 3.3.0

Bumps [chartkick](https://github.com/ankane/chartkick) from 3.2.2 to 3.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v3.2.2...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c7f424c68..f09e3f1f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,7 +109,7 @@ GEM
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    chartkick (3.2.2)
+    chartkick (3.3.0)
     childprocess (3.0.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)