diff --git a/.gitmodules b/.gitmodules
index e9e019370..fa9550625 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "db"]
   path = db
   url = https://github.com/unepwcmc/protectedplanet-db.git
-  branch = refresh
+  branch = ticket-13
\ No newline at end of file
diff --git a/app/assets/images/logos/green-list-black.png b/app/assets/images/logos/green-list-black.png
new file mode 100644
index 000000000..bed241a46
Binary files /dev/null and b/app/assets/images/logos/green-list-black.png differ
diff --git a/app/assets/images/logos/green-list.png b/app/assets/images/logos/green-list.png
index 140d43def..66e1670b5 100644
Binary files a/app/assets/images/logos/green-list.png and b/app/assets/images/logos/green-list.png differ
diff --git a/app/assets/stylesheets/base/_buttons.scss b/app/assets/stylesheets/base/_buttons.scss
index 8878e2ef5..ff0a42bfc 100644
--- a/app/assets/stylesheets/base/_buttons.scss
+++ b/app/assets/stylesheets/base/_buttons.scss
@@ -92,6 +92,20 @@ $padding-medium: rem-calc(27);
 //--------------------------------------------------
 // mixins for classes
 //--------------------------------------------------
+@mixin button-all($small: false) {
+  @include button-with-icon;
+  @include flex-no-shrink;
+  &::after { @include icon-circle-chevron-black; }
+
+  @if $small {
+    @include breakpoint($medium) { font-size: rem-calc(16); }
+
+    &::after {
+      height: rem-calc(21);
+      width: rem-calc(21);
+    }
+  }
+}
 @mixin button-burger { 
   @include button-basic; 
   @include icon-burger;
@@ -216,11 +230,7 @@ $padding-medium: rem-calc(27);
 //--------------------------------------------------
 .button {
   &--accent { @include button-block; }
-  &--all {
-    @include button-with-icon;
-    @include flex-no-shrink;
-    &::after { @include icon-circle-chevron-black; }
-  }
+  &--all { @include button-all; }
   &--download {
     @include button-with-icon;
     &::after { 
diff --git a/app/assets/stylesheets/components/_cards.scss b/app/assets/stylesheets/components/_cards.scss
index ae5186669..649339b72 100644
--- a/app/assets/stylesheets/components/_cards.scss
+++ b/app/assets/stylesheets/components/_cards.scss
@@ -4,16 +4,6 @@
 //--------------------------------------------------
 // mixins
 //--------------------------------------------------
-@mixin card-stats-padding {
-  padding: rem-calc(28 30); 
-}
-
-@mixin card-stats-number {
-  color: $primary;
-  font-weight: $bold;
-  line-height: 1;
-}
-
 //--------------------------------------------------
 // classes
 //--------------------------------------------------
diff --git a/app/assets/stylesheets/components/_lists.scss b/app/assets/stylesheets/components/_lists.scss
index 0335ddf44..2f062cfee 100644
--- a/app/assets/stylesheets/components/_lists.scss
+++ b/app/assets/stylesheets/components/_lists.scss
@@ -87,17 +87,7 @@
           justify-content: flex-end;
         }
 
-        &__a {
-          @include button-with-icon;
-          @include flex-no-shrink;
-          font-size: rem-calc(16);
-
-          &::after {
-            @include icon-circle-chevron-black;
-            height: rem-calc(21);
-            width: rem-calc(21);
-          }
-        }
+        &__a { @include button-all($small: true); }
     }
   }
 }
diff --git a/app/assets/stylesheets/components/cards/card/_card-stats.scss b/app/assets/stylesheets/components/cards/card/_card-stats.scss
index 0fa020175..393b4cda3 100644
--- a/app/assets/stylesheets/components/cards/card/_card-stats.scss
+++ b/app/assets/stylesheets/components/cards/card/_card-stats.scss
@@ -1,6 +1,13 @@
 //--------------------------------------------------
 // mixins
 //--------------------------------------------------
+@mixin card-stat-content {
+  @include flex;
+  @include flex-column;
+
+  @include breakpoint($small) { @include flex-row; }
+}
+
 @mixin card-stats-padding {
   padding: rem-calc(16 18); 
 
@@ -13,9 +20,27 @@
   line-height: 1;
 }
 
+@mixin card-stats {
+  @include card-stats-padding;
+  background-color: $white;
+  margin-top: rem-calc(30);
+}
+
+@mixin card-stats-h2 { margin-top: 0; } 
+
+@mixin card-stats-third { width: calc(33% - 16px); }
+
+@mixin card-button-external { @include button-all($small: true); }
+
 //--------------------------------------------------
 // classes
 //--------------------------------------------------
+&--stats-wrapper-chart {
+  @include container-medium;
+
+  @include breakpoint-down($small) { padding: 0; }
+}
+
 &--stats-wrapper {
   display: flex;
   flex-wrap: wrap;
@@ -26,103 +51,18 @@
   }
 }
 
-&--stats-wrapper-chart {
-  @include container-medium;
-
-  @include breakpoint-down($small) { padding: 0; }
-}
-
-&--stats {
-  @include card-stats-padding;
-  background-color: $white;
-  margin-top: rem-calc(30);
-
-  &--half {
-    width: 100%; 
-
-    @include breakpoint($small) { width: calc(50% - 15px); }
-  }
-
-  .card {
-    &__chart {
-      margin-bottom: rem-calc(14);
-      width: 50%;
-
-      @include breakpoint($small) { 
-        margin-right: rem-calc(20);
-        margin-bottom: 0;
-        width: 30%;
-      }
-    }
-
-    &__content {
-      @include flex;
-      @include flex-column;
-
-      @include breakpoint($small) { @include flex-row; }
-    }
-
-    &__logos {
-      @include flex;
-      @include ul-unstyled;
-    }
-
-    &__logo {
-      margin-left: rem-calc(24);
+&--stats-half {
+  width: 100%; 
 
-      &:first-child { margin-left: 0; }
-    }
-
-    &__logo-image {
-      width: rem-calc(100); height: auto;
-
-      display: block;
-    }
-
-    &__number { 
-      font-size: rem-calc(16);
-      font-weight: $bold; 
-      line-height: .9;
-    }
-    
-    &__number-large { 
-      font-size: rem-calc(40);
-      font-weight: $bold; 
-      line-height: .9;
-    }
-
-    &__stat-box {
-      @include bg-grey-xdark;
-      @include flex;
-      @include flex-center;
-      font-size: rem-calc(20);
-      font-weight: $bold;
-      margin-right: rem-calc(20);
-      height: rem-calc(280);
-    }
-
-    &__stat {
-      font-size: rem-calc(14);
-      line-height: 1.3;
-      margin: rem-calc(6 0 14 0);
-    }
-
-    &__stat-large { margin-bottom: rem-calc(14); }
-
-    &__subsection { border-top: solid 1px $grey-light; }
-
-    &__subtitle {
-      font-size: rem-calc(20);
-      font-weight: $bold;
-      margin: rem-calc(12 0 0 0);
-    }
-
-    &__title {
-      margin-top: 0;
-    }
-
-    &__third { width: calc(33% - 16px); }
-    &__two-thirds {  width: calc(100% - 33%); }
-  }
+  @include breakpoint($small) { width: calc(50% - 15px); }
 }
 
+@import './stats/card-stats-affiliations';
+@import './stats/card-stats-attributes';
+@import './stats/card-stats-coverage';
+@import './stats/card-stats-designations';
+@import './stats/card-stats-governance';
+@import './stats/card-stats-iucn';
+@import './stats/card-stats-management';
+@import './stats/card-stats-overview';
+@import './stats/card-stats-sources';
\ No newline at end of file
diff --git a/app/assets/stylesheets/components/cards/card/stats/_card-stats-affiliations.scss b/app/assets/stylesheets/components/cards/card/stats/_card-stats-affiliations.scss
new file mode 100644
index 000000000..a70faf698
--- /dev/null
+++ b/app/assets/stylesheets/components/cards/card/stats/_card-stats-affiliations.scss
@@ -0,0 +1,42 @@
+//--------------------------------------------------
+// classes
+//--------------------------------------------------
+&--stats-affliations {
+  @include card-stats;
+
+  .card {
+    &__button {
+      @include card-button-external;
+      margin-top: auto;
+      padding-top: rem-calc(14);
+
+      display: none; //to be added later
+    }
+
+    &__h2 { @include card-stats-h2; }
+
+    &__logos {
+      @include flex;
+      @include ul-unstyled;
+    }
+
+    &__logo {
+      margin-left: rem-calc(30);
+      max-width: rem-calc(200);
+
+      &:first-child { margin-left: 0; }
+    }
+
+    &__logo-image {
+      width: rem-calc(100); height: auto;
+
+      display: block;
+    }
+
+    &__subtitle {
+      font-weight: $bold;
+      line-height: 1.2;
+      margin: rem-calc(14 0 0 0);
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/components/cards/card/stats/_card-stats-attributes.scss b/app/assets/stylesheets/components/cards/card/stats/_card-stats-attributes.scss
new file mode 100644
index 000000000..f423ac5f6
--- /dev/null
+++ b/app/assets/stylesheets/components/cards/card/stats/_card-stats-attributes.scss
@@ -0,0 +1,10 @@
+//--------------------------------------------------
+// classes
+//--------------------------------------------------
+&--stats-attributes {
+  @include card-stats;
+
+  .card {
+    &__h2 { @include card-stats-h2; }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/components/cards/card/stats/_card-stats-coverage.scss b/app/assets/stylesheets/components/cards/card/stats/_card-stats-coverage.scss
new file mode 100644
index 000000000..1ef6d507d
--- /dev/null
+++ b/app/assets/stylesheets/components/cards/card/stats/_card-stats-coverage.scss
@@ -0,0 +1,51 @@
+//--------------------------------------------------
+// classes
+//--------------------------------------------------
+&--stats-coverage {
+  @include card-stats;
+
+  .card {
+    &__chart {
+      margin-bottom: rem-calc(14);
+      width: 50%;
+
+      @include breakpoint($small) { 
+        margin-right: rem-calc(20);
+        margin-bottom: 0;
+        width: 30%;
+      }
+    }
+
+    &__content { @include card-stat-content; }
+
+    &__h2 { @include card-stats-h2; }
+
+    &__number { 
+      font-size: rem-calc(16);
+      font-weight: $bold; 
+      line-height: .9;
+    }
+    
+    &__number-large { 
+      font-size: rem-calc(40);
+      font-weight: $bold; 
+      line-height: .9;
+    }
+
+    &__stat {
+      font-size: rem-calc(14);
+      line-height: 1.3;
+      margin: rem-calc(6 0 14 0);
+    }
+
+    &__stat-large { margin-bottom: rem-calc(14); }
+
+    &__subsection { border-top: solid 1px $grey-light; }
+
+    &__subtitle {
+      font-size: rem-calc(20);
+      font-weight: $bold;
+      margin: rem-calc(12 0 0 0);
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/components/cards/card/stats/_card-stats-designations.scss b/app/assets/stylesheets/components/cards/card/stats/_card-stats-designations.scss
new file mode 100644
index 000000000..46082ddad
--- /dev/null
+++ b/app/assets/stylesheets/components/cards/card/stats/_card-stats-designations.scss
@@ -0,0 +1,12 @@
+//--------------------------------------------------
+// classes
+//--------------------------------------------------
+&--stats-designations {
+  @include card-stats;
+
+  .card {
+    &__h2 { @include card-stats-h2; }
+
+    &__third { @include card-stats-third; }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/components/cards/card/stats/_card-stats-governance.scss b/app/assets/stylesheets/components/cards/card/stats/_card-stats-governance.scss
new file mode 100644
index 000000000..2e57cd8fa
--- /dev/null
+++ b/app/assets/stylesheets/components/cards/card/stats/_card-stats-governance.scss
@@ -0,0 +1,10 @@
+//--------------------------------------------------
+// classes
+//--------------------------------------------------
+&--stats-governance {
+  @include card-stats;
+
+  .card {
+    &__h2 { @include card-stats-h2; }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/components/cards/card/stats/_card-stats-iucn.scss b/app/assets/stylesheets/components/cards/card/stats/_card-stats-iucn.scss
new file mode 100644
index 000000000..3fa68696e
--- /dev/null
+++ b/app/assets/stylesheets/components/cards/card/stats/_card-stats-iucn.scss
@@ -0,0 +1,10 @@
+//--------------------------------------------------
+// classes
+//--------------------------------------------------
+&--stats-iucn {
+  @include card-stats;
+
+  .card {
+    &__h2 { @include card-stats-h2; }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/components/cards/card/stats/_card-stats-management.scss b/app/assets/stylesheets/components/cards/card/stats/_card-stats-management.scss
new file mode 100644
index 000000000..5ef9f65d2
--- /dev/null
+++ b/app/assets/stylesheets/components/cards/card/stats/_card-stats-management.scss
@@ -0,0 +1,10 @@
+//--------------------------------------------------
+// classes
+//--------------------------------------------------
+&--stats-management {
+  @include card-stats;
+
+  .card {
+    &__h2 { @include card-stats-h2; }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/components/cards/card/_card-stats-overview.scss b/app/assets/stylesheets/components/cards/card/stats/_card-stats-overview.scss
similarity index 100%
rename from app/assets/stylesheets/components/cards/card/_card-stats-overview.scss
rename to app/assets/stylesheets/components/cards/card/stats/_card-stats-overview.scss
diff --git a/app/assets/stylesheets/components/cards/card/stats/_card-stats-sources.scss b/app/assets/stylesheets/components/cards/card/stats/_card-stats-sources.scss
new file mode 100644
index 000000000..b6620baa8
--- /dev/null
+++ b/app/assets/stylesheets/components/cards/card/stats/_card-stats-sources.scss
@@ -0,0 +1,25 @@
+//--------------------------------------------------
+// classes
+//--------------------------------------------------
+&--stats-sources {
+  @include card-stats;
+
+  .card {
+    &__content { @include card-stat-content; }
+
+    &__h2 { @include card-stats-h2; }
+
+    &__stat-box {
+      @include bg-grey-black;
+      @include flex;
+      @include flex-center;
+      font-size: rem-calc(20);
+      font-weight: $bold;
+      margin-right: rem-calc(20);
+      height: rem-calc(280);
+    }
+
+    &__third { @include card-stats-third; }
+    &__two-thirds {  width: calc(100% - 33%); }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/components/cards/card/stats/_cards-stats-overlap.scss b/app/assets/stylesheets/components/cards/card/stats/_cards-stats-overlap.scss
new file mode 100644
index 000000000..49c77fd75
--- /dev/null
+++ b/app/assets/stylesheets/components/cards/card/stats/_cards-stats-overlap.scss
@@ -0,0 +1,10 @@
+//--------------------------------------------------
+// classes
+//--------------------------------------------------
+&--stats-overlap {
+  @include card-stats;
+
+  .card {
+    &__h2 { @include card-stats-h2; }
+  }
+}
\ No newline at end of file
diff --git a/app/models/green_list_status.rb b/app/models/green_list_status.rb
new file mode 100644
index 000000000..37a488a99
--- /dev/null
+++ b/app/models/green_list_status.rb
@@ -0,0 +1,3 @@
+class GreenListStatus < ApplicationRecord
+   has_one :protected_area
+end
\ No newline at end of file
diff --git a/app/models/protected_area.rb b/app/models/protected_area.rb
index 09b304524..dc08b096c 100644
--- a/app/models/protected_area.rb
+++ b/app/models/protected_area.rb
@@ -19,6 +19,7 @@ class ProtectedArea < ApplicationRecord
   belongs_to :designation
   delegate :jurisdiction, to: :designation, allow_nil: true
   belongs_to :wikipedia_article
+  belongs_to :green_list_status
 
   after_create :create_slug
 
@@ -30,7 +31,7 @@ class ProtectedArea < ApplicationRecord
   }
 
   scope :green_list_areas, -> {
-    where(is_green_list: true)
+    where.not(green_list_status_id: nil)
   }
 
   scope :most_protected_marine_areas, -> (limit) {
@@ -76,6 +77,10 @@ def self.green_list_total_km
     green_list_areas.inject(0) { |_sum, pa| _sum + pa.gis_area }
   end
 
+  def is_green_list
+    green_list_status_id.present?
+  end
+
   def wdpa_ids
     wdpa_id
   end
diff --git a/app/presenters/protected_area_presenter.rb b/app/presenters/protected_area_presenter.rb
index fd2cccc50..0d402181b 100644
--- a/app/presenters/protected_area_presenter.rb
+++ b/app/presenters/protected_area_presenter.rb
@@ -111,23 +111,42 @@ def attributes
 
   def external_links
     [
-      {
-        title: 'View more',
-        image_url: ActionController::Base.helpers.image_url('logos/green-list.png'),
-        link_title: "View the Green List page for #{protected_area.name}",
-        url: '' ##TODO links needed from CSV provided by IUCN.
-      },
-      {
-        title: 'View more',
-        image_url: ActionController::Base.helpers.image_url('logos/parcc.png'),
-        link_title: "View the climate change vulnerability assessments for #{protected_area.name}",
-        link_url: url_for_related_source('parcc_info', protected_area)
-      }
-    ]
+      green_list_status_info,
+      parcc_info
+    ].compact
   end
 
   private
 
+  def green_list_status_info
+    return unless protected_area.green_list_status_id
+
+    gls = protected_area.green_list_status
+    {
+      affiliation: 'greenlist',
+      date: gls.expiry_date,
+      image_url: green_list_logo(gls.status),
+      link_title: "View the Green List page for #{protected_area.name}",
+      type: gls.status,
+      url: '' ##TODO links needed from CSV provided by IUCN.
+    }
+  end
+
+  def green_list_logo(status)
+    logo = status.downcase == 'candidate' ? 'green-list-black' : 'green-list'
+    ActionController::Base.helpers.image_url("logos/#{logo}.png")
+  end
+
+  def parcc_info
+    return unless protected_area.has_parcc_info
+
+    {
+      image_url: ActionController::Base.helpers.image_url('logos/parcc.png'),
+      link_title: "View the climate change vulnerability assessments for #{protected_area.name}",
+      link_url: url_for_related_source('parcc_info', protected_area)
+    }
+  end
+
   def protected_area
     @protected_area
   end
@@ -161,12 +180,7 @@ def num_fields_with_data
 
   def parse_management_plan management_plan
     if (management_plan.is_a? String) && (management_plan.starts_with?("http"))
-      ActionController::Base.helpers.link_to(
-        I18n.t('stats.management-plan.button'), 
-        management_plan, 
-        target: '_blank',
-        title: I18n.t('stats.management-plan.button-title', site: @protected_area.name)
-      )
+      ActionController::Base.helpers.link_to("View Management Plan", management_plan)
     else
       management_plan
     end
diff --git a/app/presenters/thematical_areas_presenter.rb b/app/presenters/thematical_areas_presenter.rb
index cb090af0a..9cca0ffa4 100644
--- a/app/presenters/thematical_areas_presenter.rb
+++ b/app/presenters/thematical_areas_presenter.rb
@@ -41,7 +41,7 @@ def pas_figure(label)
     when theme(:marine)
       pas.where(marine: true)
     when theme(:green_list)
-      pas.where(is_green_list: true)
+      pas.where.not(green_list_status_id: nil)
     when theme(:wdpa)
       pas.wdpas
     when theme(:oecm)
diff --git a/app/views/country/show.html.erb b/app/views/country/show.html.erb
index afd60a05b..9fd323311 100644
--- a/app/views/country/show.html.erb
+++ b/app/views/country/show.html.erb
@@ -57,10 +57,9 @@
       <%= render partial: "partials/cards/sites", locals: { cards: @sites } %>
 
       <%= render partial: "partials/messages/message-citation", locals: { title: @country.name } %>
-
-
-<i class="link-with-icon__icon fa fa-download"></i>Download this dataset
-<%= download_dropdown(@country.iso_3, 'general', (types rescue [:csv, :shp])) %>
+    </section>
+  </div>
+</div>
 
 <h1>related countries</h1>      
 <% if @country.children.any? || @country.parent.present? %>
@@ -110,38 +109,15 @@
   </section>
 <% end %>
 
-<aside class="info-box info-box--fill-color">
-  <section class="info-box__column">
-    <h2 class="info-box__header header-with-delimiter header-with-delimiter--bold">Citation</h2>
-    <p class="info-box__body">
-    UNEP-WCMC (<%= Date.today.year %>). Protected Area Profile for <%= @country.name %> from the World Database of Protected Areas, <%= Date.today.strftime("%B %Y") %>. Available at: <a href="/">www.protectedplanet.net</a>
-    </p>
-  </section>
-
-  <section class="info-box__column">
-    <h2 class="info-box__header header-with-delimiter header-with-delimiter--bold">Downloads</h2>
-    <div class="info-box__body info-box__body--no-padding">
-      <div class="js-download-btn info-box__row">
-        <div class="js-trigger tooltip-old__trigger info-box__link">
-          <i class="info-box__link-icon fa fa-download"></i>Download this dataset
-          <%= download_dropdown(@country.iso_3, 'general', (types rescue [:csv, :shp])) %>
-        </div>
-        <a href="<%= url_for(action: :show, iso: @country.iso, format: :pdf) %>" class="info-box__link">
-          <i class="info-box__link-icon fa fa-file-pdf-o"></i>Download this page as a PDF
-        </a>
-      </div>
 
-      <%#= render 'documentation' %>
-
-      <div class="<%= bem('info-box__row', 'no-border') %>">
-        <button class="big-button" onclick="window.location.href='<%= search_url(country: @country.name, main: :country) %>'">
-          <i class="fa fa-link big-button__icon"></i>Protected Area list of the country
-        </button>
-      </div>
-    </div>
-  </section>
-</aside>
-
-    </section>
+<h1>malaysia docs</h1>
+<% if is_malaysia? %>
+  <div class="info-box__row">
+    <div class='header-with-delimiter no-border'>Protected areas documentation</div>
+    <% malaysia_documents.map do |doc| %>
+      <a href="<%= doc[:url] %>" class="info-box__link">
+        <i class="info-box__link-icon fa fa-file-pdf-o"></i><%= doc[:name] %>
+      </a>
+    <% end %>
   </div>
-</div>
+<% end %>
diff --git a/app/views/partials/stats/_stats-attributes.html.erb b/app/views/partials/stats/_stats-attributes.html.erb
index 8c745cd77..06ccbf195 100644
--- a/app/views/partials/stats/_stats-attributes.html.erb
+++ b/app/views/partials/stats/_stats-attributes.html.erb
@@ -1,5 +1,5 @@
-<div class="card--stats">
-  <h2><%= t('stats.attributes.title') %></h2>
+<div class="card--stats-attributes">
+  <h2 class="card__h2"><%= t('stats.attributes.title') %></h2>
 
   <ul class="list--stripes">
     <% attributes.each do |attribute| %>
diff --git a/app/views/partials/stats/_stats-coverage.html.erb b/app/views/partials/stats/_stats-coverage.html.erb
index 9b2e4d520..aa64049ec 100644
--- a/app/views/partials/stats/_stats-coverage.html.erb
+++ b/app/views/partials/stats/_stats-coverage.html.erb
@@ -1,5 +1,5 @@
-<div class="card--stats card--stats--half">
-  <h2 class="card__title"><%= t("stats.#{type}-title") %></h2>
+<div class="card--stats-coverage card--stats-half">
+  <h2 class="card__h2"><%= t("stats.#{type}-title") %></h2>
 
   <div class="card__content">
     <div class="card__chart">
diff --git a/app/views/partials/stats/_stats-designations.html.erb b/app/views/partials/stats/_stats-designations.html.erb
index ffbefbed2..6c4dcbc0c 100644
--- a/app/views/partials/stats/_stats-designations.html.erb
+++ b/app/views/partials/stats/_stats-designations.html.erb
@@ -1,5 +1,5 @@
-<div class="card--stats">
-  <h2><%= t('stats.designations.title') %></h2>
+<div class="card--stats-designations">
+  <h2 class="card__h2"><%= t('stats.designations.title') %></h2>
 
   <div>
     <chart-row-stacked 
diff --git a/app/views/partials/stats/_stats-external.html.erb b/app/views/partials/stats/_stats-external.html.erb
index ba7d7b988..15b0fe345 100644
--- a/app/views/partials/stats/_stats-external.html.erb
+++ b/app/views/partials/stats/_stats-external.html.erb
@@ -1,13 +1,24 @@
-<div class="card--stats <%= get_local_classes local_assigns %>">
-  <h2>Lorem Ipsum</h2>
+<div class="card--stats-affliations">
+  <h2 class="card__h2"><%= t('stats.external.title') %></h2>
+
 
   <ul class="card__logos">
     <% external_links.each do |link| %>
       <li class="card__logo">
-        <%= link_to link[:link_url], title: link[:link_title] do %>
-          <%= image_tag link[:image_url], alt: link[:image_alt], class: 'card__logo-image' %>
-          <span><%= link[:title] %></span>
+        <%= image_tag link[:image_url], alt: link[:image_alt], class: 'card__logo-image' %>
+
+        <% if link[:affiliation] == 'greenlist' %>
+          <p><%= t('stats.green-list.intro') %>
+          <p class="card__subtitle"><%= t('stats.green-list.type') %></p>
+          <span><%= link[:type] %></span>
+
+          <% if link[:date] %>
+            <p class="card__subtitle"><%= t('stats.green-list.date') %></p>
+            <span><%= link[:date] %></span>
+          <% end %>
         <% end %>
+  
+        <%= link_to t('global.button.more'), link[:link_url], title: link[:link_title], target: '_blank', class: 'card__button' %>
       </li>
     <% end %>
   </ul>
diff --git a/app/views/partials/stats/_stats-governance.html.erb b/app/views/partials/stats/_stats-governance.html.erb
index 8ad6549ab..ff09755c2 100644
--- a/app/views/partials/stats/_stats-governance.html.erb
+++ b/app/views/partials/stats/_stats-governance.html.erb
@@ -1,5 +1,5 @@
-<div class="card--stats card--stats--half">
-  <h2><%= t('stats.governance.title') %></h2>
+<div class="card--stats-governance card--stats-half">
+  <h2 class="card__h2"><%= t('stats.governance.title') %></h2>
 
   <div>
     Chart
diff --git a/app/views/partials/stats/_stats-iucn-categories.html.erb b/app/views/partials/stats/_stats-iucn-categories.html.erb
index 65a6ddbaf..b3c0d740a 100644
--- a/app/views/partials/stats/_stats-iucn-categories.html.erb
+++ b/app/views/partials/stats/_stats-iucn-categories.html.erb
@@ -1,5 +1,5 @@
-<div class="card--stats card--stats--half">
-  <h2><%= t('stats.iucn-categories.title') %></h2>
+<div class="card--stats-iucn card--stats-half">
+  <h2 class="card__h2"><%= t('stats.iucn-categories.title') %></h2>
 
   <ul class="list--underline">
     <% iucn_categories.each do |category| %>
diff --git a/app/views/partials/stats/_stats-overlap.html.erb b/app/views/partials/stats/_stats-overlap.html.erb
new file mode 100644
index 000000000..12319b577
--- /dev/null
+++ b/app/views/partials/stats/_stats-overlap.html.erb
@@ -0,0 +1,3 @@
+<div class="card--stats">
+  <h2 class="card__h2">Chart - overlaps</h2>
+</div>
\ No newline at end of file
diff --git a/app/views/partials/stats/_stats-pame.html.erb b/app/views/partials/stats/_stats-pame.html.erb
index 43a721070..872a4fd5b 100644
--- a/app/views/partials/stats/_stats-pame.html.erb
+++ b/app/views/partials/stats/_stats-pame.html.erb
@@ -1,5 +1,6 @@
-<div class="card--stats <%= get_local_classes local_assigns %>">
-  <h2><%= t('stats.pame.title') %></h2>
+<div class="card--stats-management">
+  <h2 class="card__h2"><%= t('stats.pame.title') %></h2>
+
 
   <% if pame_evaluations_summary.any? %>
     <ul class="list--stripes">
diff --git a/app/views/partials/stats/_stats-sources.html.erb b/app/views/partials/stats/_stats-sources.html.erb
index 206a67c1b..f3f09195c 100644
--- a/app/views/partials/stats/_stats-sources.html.erb
+++ b/app/views/partials/stats/_stats-sources.html.erb
@@ -1,5 +1,5 @@
-<div class="card--stats sm-sources">
-  <h2 class="card"><%= t('stats.sources.title') %></h2>
+<div class="card--stats-sources sm-sources">
+  <h2 class="card__h2"><%= t('stats.sources.title') %></h2>
   
   <div class="card__content flex">
     <div class="card__stat-box card__third">
diff --git a/app/views/protected_areas/show.html.erb b/app/views/protected_areas/show.html.erb
index 9e53fc03a..e6febc6d8 100644
--- a/app/views/protected_areas/show.html.erb
+++ b/app/views/protected_areas/show.html.erb
@@ -17,6 +17,16 @@
       } %>
     </section>
 
+<<<<<<< HEAD
+    <div class="card--stats-wrapper">
+      <div class="card--stats-half">
+        <%= render partial: "partials/stats/stats-attributes", locals: { attributes: @presenter.attributes } %>
+      </div>
+      
+      <div class="flex flex-column card--stats-half">
+        <%= render "partials/stats/stats-pame" %>
+        <%= render partial: "partials/stats/stats-external", locals: { external_links: @presenter.external_links } %>
+=======
     <div class="page__container">
       <div class="page__col-1">
         <%= render partial: "partials/stats/stats-attributes", locals: { attributes: @presenter.attributes } %>
@@ -27,12 +37,11 @@
           classes: 'page__col-child',
           external_links: @presenter.external_links 
         } %>
+>>>>>>> refresh
       </div>
     </div>
 
-    <div class="card--stats">
-      <h1>Chart - overlaps</h1>
-    </div>
+    <%= render partial: "partials/stats/stats-overlap" %>
 
     <%= render partial: "partials/stats/stats-sources", locals: { sources: @sources } %>
     
@@ -40,71 +49,21 @@
   </div>  
 </div>
 
-
-
-
-
 <%= content_for :seo, "Learn about and visualise the protected area #{@protected_area.name} (#{@protected_area.designation.try(:name)}), situated in #{@countries.map(&:name).join("; ") rescue "Areas Beyond National Jurisdiction"}" %>
 <%= content_for :seo_image, tiles_url(type: "protected_area", id: @protected_area.wdpa_id, version: 1) %>
 <%= content_for :page_title, @protected_area.name %>
 
 <% has_designations = @protected_area.networks.detect(&:designation).present? %>
 
-<div class="template--site container--profile container--push-bottom pdf--protected-area">
-  <h1 class="header--h1-small">
-    
-    
-  </h1>
-
-  <% if has_designations %>
-    <div class="info-box info-box--fill-color info-box--small">
-      <p class="icon--info">
-        This site has multiple designations. <%= link_to raw('(See all details &#8595;)'), '#anchor-designations', class: 'link--page-anchor' %>
-      </p>
-    </div>
-  <% end %>
-
-  
-
-<%= link_to url_for(action: :show, id: @protected_area.wdpa_id, format: :pdf), class: 'link link--hero-download' do %>
-<i class="fa fa-file-pdf-o"></i>Download site
-<% end %>
-
-
-<section class="js-fullscreen-target fullscreen" data-id="map-site-target">
-  
-  <button 
-    class="button--fullscreen js-fullscreen-button js-fullscreen-button-site fa fa-expand fullscreen__button-site u-only-desktop" 
-    data-id="map-site"
-    data-type="expand">
-  </button>
-
-  <div 
-    id="map-site" 
-    class="map map--hero"
-    data-bound-from="<%= @protected_area.bounds.first %>"
-    data-bound-to="<%= @protected_area.bounds.last %>"
-    data-wdpa-ids="<%= [@protected_area.wdpa_id] %>"
-    data-control-position="bottomleft">
-  </div>
-
-  <div class="disclaimer">
-    The designations employed and the presentation of material on this map do not
-    imply the expression of any opinion whatsoever on the part of the Secretariat
-    of the United Nations concerning the legal status of any country, territory,
-    city or area or of its authorities, or concerning the delimitation of its
-    frontiers or boundaries.
+<% if has_designations %>
+  <div class="info-box info-box--fill-color info-box--small">
+    <p class="icon--info">
+      This site has multiple designations. <%= link_to raw('(See all details &#8595;)'), '#anchor-designations', class: 'link--page-anchor' %>
+    </p>
   </div>
-
-</section>
-
-<% if @protected_area.story_map_links.any? %>
-    <h2 class="header--section u-margin--page">Link to story map</h2>
-    <% @protected_area.story_map_links.each do |story_map_link| %>
-      <p class="u-margin--page"><%= link_to "Story Map(#{story_map_link.link_type})", story_map_link.link, class: 'link is-external', title: 'view the Story map', target: '_blank'%></p>
-    <% end %>
 <% end %>
 
+
   <% if has_designations %>
     <section id="anchor-designations">
       <h2 class="header--section">Site multiple designations</h2>
@@ -139,62 +98,14 @@
     </section>
   <% end %>
 
-  <% if @networks.any? %>
-    <% unless @for_pdf %>
-      <%= render partial: "map_connections" %>
-    <% end %>
-
-    <section>
-  <h2 class="header--section u-margin--page">Site network breakdown</h2>
-
-  <div class="js-tabs-network tab-container">
-    <% unless @for_pdf %>
-      <ul class="tab__titles u-margin--page">
-        <% @networks.each_with_index do |network, i| %>
-          <li data-id="tab-<%= i+1 %>" class="tab__title js-tab-title <%= "tab__title--active" if i.zero? %>"><%= network.name %></li>
-        <% end %>
-      </ul>
-    <% end %>
-
-    <% @networks.each_with_index do |network, i| %>
-      <div data-id="tab-<%= i+1 %>-content" class="tab__content js-tab-content <%= "u-hide" unless i.zero? %>">
-        
-        <% if @for_pdf %>
-          <span class="tab__title tab__title--active"><%= network.name %></span>
-        <% end %>
-        
-        <p class="article__paragraph u-margin--page"></p>
-        
-        <div class="js-show-hide-wrapper">
-          
-          <div class="flex-row-wrap u-pdf-no-break js-show-hide-targets">
-            <% network.protected_areas.each do |protected_area| %>
-              <% next if protected_area.id == @protected_area.id %>
-              <%= render partial: "pa_card", locals: { protected_area: protected_area, comparison_protected_area: @protected_area } %>
-            <% end %>
-          </div>
-
-          <button data-type="show" class="button--grey u-margin-auto u-block js-show-hide">Show all</button>
-        </div>
-      </div>
-    <% end %>
-  </div>
-  
-</section>
-  <% end %>
+<% if management_plan_document %>
+  <section class="fact">
+    <h2 class="fact__header">Management Plan</h2>
 
-  <section class="info-box__column">
-    <h2 class="info-box__header header-with-delimiter header-with-delimiter--bold">Downloads</h2>
-    <div class="info-box__body info-box__body--no-padding">
-      <div class="info-box__row">
-        <button class="js-download-btn info-box__link u-only-desktop tooltip-old__trigger js-trigger">
-          <i class="info-box__link-icon fa fa-download"></i>Download site GIS file
-          <%= download_dropdown(@protected_area.wdpa_id, 'protected_area', (types rescue [:csv, :shp])) %>
-        </button>
-        <%= link_to url_for(action: :show, id: @protected_area.wdpa_id, format: :pdf), class: 'info-box__link' do %>
-          <i class="info-box__link-icon fa fa-file-pdf-o"></i>Download site
-        <% end %>
-      </div>
-    </div>
+    <a href="<%= management_plan_document %>" class="info-box--margin-top info-box__link">
+      <i class="info-box__link-icon fa fa-file-pdf-o"></i><%= "#{@protected_area.name} Management Plan" %>
+    </a>
   </section>
+<% end %>
+
 </div>
diff --git a/config/locales/global/en.yml b/config/locales/global/en.yml
index 234caf560..9fe5c871e 100644
--- a/config/locales/global/en.yml
+++ b/config/locales/global/en.yml
@@ -8,6 +8,7 @@ en:
       download-pdf: PDF Download
       download: Download
       link: Link
+      more: More info
       pdf: PDF
     footer:
       copyright: "ProtectedPlanet 2014-%{date}. All rights reserved"
diff --git a/config/locales/stats/en.yml b/config/locales/stats/en.yml
index 4c3673615..9ec2a5502 100644
--- a/config/locales/stats/en.yml
+++ b/config/locales/stats/en.yml
@@ -7,10 +7,16 @@ en:
     coverage-chart-smallprint: The graph excludes status years with no information reported (STAT_YR = 0).
     designations:
       title: Designations
+    external:
+      title: Affiliations
     growth:
       title: Growth in protected area coverage
     governance: 
       title: Governance types
+    green-list:
+      intro: This site is part of the IUCN Green List Community
+      type: Green List Status
+      date: Certification Expiry Date
     iucn-categories: 
       title: IUCN Management Categories
     location: Location
diff --git a/db b/db
index d27b2579b..5c67afab7 160000
--- a/db
+++ b/db
@@ -1 +1 @@
-Subproject commit d27b2579b2e0a399a157cf4e93c2fa230f78b3fc
+Subproject commit 5c67afab71ecbc42bec757a208c41efeaa364261
diff --git a/lib/data/seeds/green_list_sites.csv b/lib/data/seeds/green_list_sites.csv
index 1663afec1..01cbea3b0 100644
--- a/lib/data/seeds/green_list_sites.csv
+++ b/lib/data/seeds/green_list_sites.csv
@@ -1,59 +1,114 @@
-site
-17231
-902497
-555558374
-303317
-309970
-3215
-555526032
-345942
-555539507
-354414
-4044
-62735
-7523
-555526045
-555539517
-303038
-303320
-555547502
-20299
-168201
-555624257
-365025
-659
-17744
-12223
-10754
-147297
-330608
-15089
-388659
-819
-555526036
-555555490
-303552
-83037
-555542446
-108125
-555544085
-63136
-9739
-13966
-555555517
-555555499
-26625
-83268
-68137
-555526606
-61595
-662
-9782
-345888
-306808
-721
-4114
-303045
-6307
-555624365
-902487
+wdpaid,status,expiry_date
+306808,Green Listed,19-03-2024
+108125,Green Listed,27-01-2023
+83037,relisted,31-12-2023
+388659,relisted,19-03-2024
+662,relisted,31-12-2023
+4044,relisted,31-12-2023
+147297,relisted,31-12-2023
+555555490,Green Listed,27-10-2023
+659,Green Listed,19-03-2023
+330608,Green Listed,19-03-2024
+345942,Green Listed,31-12-2023
+345888,Green Listed,31-12-2023
+555547502,Green Listed,31-12-2023
+83268,Green Listed,31-12-2023
+6307,Green Listed,31-12-2023
+555555517,Green Listed,27-10-2023
+62735,Green Listed,19-03-2024
+303320,Green Listed,27-10-2023
+256,Candidate,
+555544085,Candidate,
+68137,Candidate,
+902497,Green Listed,31-12-2023
+555526767,Candidate,
+555542446,Candidate,
+17360,Candidate,
+555558374,Green Listed,31-12-2023
+365025,Candidate,
+17231,Green Listed,27-10-2023
+17709,Green Listed,31-12-2023
+168201,Candidate,
+555624365,Candidate,
+555539517,Candidate,
+303317,Green Listed,27-10-2023
+819,Candidate,
+20299,Candidate,
+26625,Candidate,
+63136,relisted,31-12-2024
+309970,relisted,31-12-2024
+354414,relisted,01-01-2024
+17744,Candidate,
+555624257,Candidate,
+555526032,Candidate,
+555526045,Candidate,
+555526036,Candidate,
+555526606,Candidate,
+15089,Candidate,
+555599909,Candidate,
+4114,Candidate,
+9782,Green Listed,31-12-2023
+555555499,relisted,27-10-2023
+311888,Candidate,
+303038,Candidate,
+303045,Candidate,
+61595,Candidate,
+303072,Candidate,
+10754,Green Listed,31-12-2019
+12223,Green Listed,31-12-2019
+13966,Green Listed,31-12-2019
+303552,Green Listed,31-12-2025
+902487,Green Listed,27-10-2023
+147283,Candidate,
+718,Green Listed,31-12-2019
+769,Green Listed,31-12-2019
+768,Green Listed,31-12-2019
+555525592,Candidate,
+143,Candidate,
+7873,Candidate,
+32674,Candidate,
+555697546,Candidate,
+7523,Candidate,
+721,Candidate,
+555555513,Candidate,
+62990,Candidate,
+10279,Candidate,
+306793_A,Candidate,
+306793_B,Candidate,
+306844_A,Candidate,
+06844_B,Candidate,
+1850_A,Candidate,
+1850_B,Candidate,
+306777,Candidate,
+306779,Candidate,
+555548807,Candidate,
+306780,Candidate,
+767,Candidate,
+555514399,Candidate,
+555525849,Candidate,
+555577562,Candidate,
+663,Candidate,
+95349,Candidate,
+6271,Candidate,
+106711,Candidate,
+18998,Candidate,
+62716,Candidate,
+3981,Candidate,
+15260,Candidate,
+147302,Candidate,
+555577562,Candidate,
+36534,Candidate,
+26654,Candidate,
+67860,Candidate,
+95996,Candidate,
+3014,Candidate,
+63642,Candidate,
+555637437,Candidate,
+64511,Candidate,
+13165,Candidate,
+18805,Candidate,
+30697,Candidate,
+313091,Candidate,
+555582988,Candidate,
+18807,Candidate,
+915,Candidate,
\ No newline at end of file
diff --git a/lib/modules/wdpa/green_list_importer.rb b/lib/modules/wdpa/green_list_importer.rb
index f88d72e4a..d06a0398a 100644
--- a/lib/modules/wdpa/green_list_importer.rb
+++ b/lib/modules/wdpa/green_list_importer.rb
@@ -1,30 +1,43 @@
 module Wdpa::GreenListImporter
+  # Make sure headers are: wdpaid,status,expiry_date
   GREEN_LIST_SITES_CSV = "#{Rails.root}/lib/data/seeds/green_list_sites.csv"
   extend self
 
   def import
     ActiveRecord::Base.transaction do
-      old_green_list = ProtectedArea.where(is_green_list: true)
-      old_green_list.update_all(is_green_list: false)
-      csv = CSV.read(GREEN_LIST_SITES_CSV)
-      csv.shift # remove headers
+      ProtectedArea.where.not(green_list_status_id: nil).
+        update_all(green_list_status_id: nil)
+      GreenListStatus.destroy_all
 
-      sites = csv.map { |row| row }.flatten.uniq
+      invalid = []
+      not_found = []
+      duplicates = []
 
-      sites.each do |site|
-        wdpa_id = Integer(site) rescue false
-        if wdpa_id
-          pa = ProtectedArea.find_by_wdpa_id(wdpa_id)
-        else
-          pa = ProtectedArea.find_by_slug(site)
+      CSV.foreach(GREEN_LIST_SITES_CSV, headers: true) do |row|
+        wdpa_id = Integer(row['wdpaid']) rescue false
+        unless wdpa_id
+          invalid << row['wdpaid']
+          next
         end
 
-        unless pa.blank?
-          pa.is_green_list = true
+        pa = ProtectedArea.find_by_wdpa_id(wdpa_id)
+
+        if pa.blank?
+          not_found << wdpa_id
+        else
+          if pa.green_list_status_id
+            duplicates << wdpa_id
+            next
+          end
+          gls = GreenListStatus.create(row.to_h.slice('status', 'expiry_date'))
+          pa.green_list_status_id = gls.id
           pa.save
-          puts "Marked #{site} as a green list site"
         end
       end
+
+      puts "Invalid WDPAIDs found: #{invalid.join(',')}"
+      puts "PA with WDPAID not found: #{not_found.join(',')}"
+      puts "Statuses rows for same WDPAID found: #{duplicates.join(',')}"
     end
   end
 end
diff --git a/test/unit/wdpa/green_list_importer_test.rb b/test/unit/wdpa/green_list_importer_test.rb
index 4dfd4a3f3..8dd7ab6f1 100644
--- a/test/unit/wdpa/green_list_importer_test.rb
+++ b/test/unit/wdpa/green_list_importer_test.rb
@@ -1,19 +1,61 @@
 require 'test_helper'
 
 class TestWdpaMarineStatsImporter < ActiveSupport::TestCase
-  test "#import update sites to be green list" do
+  def before_setup
+    super
+
     wdpa_ids = [1,2,3]
     wdpa_ids.each do |wdpa_id|
       FactoryGirl.create(:protected_area, wdpa_id: wdpa_id)
     end
 
-    green_list_sites = wdpa_ids.slice(1,2).each_slice(1).to_a
-    csv_content = [['site'], green_list_sites]
-    CSV.stubs(:read).returns(csv_content)
+    #multiple_yields from mocha expects multiple arrays,
+    #an array for each row
+    csv_content = [
+      [{
+        'wdpaid' => 1,
+        'status' => 'Green Listed',
+        'expiry_date' => Date.today
+      }],
+      [{
+        'wdpaid' => 2,
+        'status' => 'Candidate',
+        'expiry_date' => Date.today
+      }]
+    ]
+
+    CSV.stubs(:foreach).with("#{Rails.root}/lib/data/seeds/green_list_sites.csv", headers: true).
+      multiple_yields(*csv_content)
+  end
 
+  test "#import updates sites to be green list" do
     Wdpa::GreenListImporter.import
-    green_list_pas = ProtectedArea.where(is_green_list: true).count
+    green_list_pas = ProtectedArea.where.not(green_list_status_id: nil).count
 
     assert_equal green_list_pas, 2
   end
+
+  test "#import creates correct number of GreenListStatus records" do
+    Wdpa::GreenListImporter.import
+
+    assert_equal GreenListStatus.count, 2
+  end
+
+  test "#import creates GreenListStatus records with correct status" do
+    Wdpa::GreenListImporter.import
+    gls_1 = ProtectedArea.find_by(wdpa_id: 1).green_list_status
+    gls_2 = ProtectedArea.find_by(wdpa_id: 2).green_list_status
+ 
+    assert_equal gls_1.status, 'Green Listed'
+    assert_equal gls_2.status, 'Candidate'
+  end
+
+  test "#import creates GreenListStatus records with correct expiry date" do
+    Wdpa::GreenListImporter.import
+    gls_1 = ProtectedArea.find_by(wdpa_id: 1).green_list_status
+    gls_2 = ProtectedArea.find_by(wdpa_id: 2).green_list_status
+ 
+    assert_equal gls_1.expiry_date, Date.today
+    assert_equal gls_2.expiry_date, Date.today
+  end
 end