diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 787ac7f77bbeb9a1f7f42e9ca441598cd7fa8c27..297c7c3e1722b3a1b26e244526140467a2a5bdad 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,7 @@
+WCM Base 7.x-1.x, 2015-09-15
+----------------------------
+- Fieldable Panel Panes: Security release 1.7
+
 WCM Base 7.x-1.x, 2015-09-11
 ----------------------------
 - WCM Tile Panes: Added tile image style field.
diff --git a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/CHANGELOG.txt b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/CHANGELOG.txt
index ba0afe3baa8fe4030e698630beaf9f2a9f3ea90c..8a7ca31800dbac2ab6e5993ce9a1c3fc1f410067 100644
--- a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/CHANGELOG.txt
@@ -1,3 +1,9 @@
+Fieldable Panels Panes 7.x-1.7, 2015-09-02
+------------------------------------------
+By Chris Burges, dsnopek, DamienMcKenna: Added "check editable" callback for
+  CTools pane definition, refactored FPP object loading.
+
+
 Fieldable Panels Panes 7.x-1.6, 2015-05-29
 ------------------------------------------
 #2427275 by DamienMcKenna: Fixed line_entity_form integration.
@@ -26,7 +32,7 @@ Fieldable Panels Panes 7.x-1.6-beta1, 2015-02-02
   (https://drupal.org/node/2146479).
 #2074735 by rogical: Added configure link to admin/structure/fieldable-panels
   -panes in the info file.
-#2250383 by DamienMcKenna: Require CToosl 1.4 or newer.
+#2250383 by DamienMcKenna: Require CTools 1.4 or newer.
 #2145209 by primozsusa, eft, DamienMcKenna: Support for the Migrate module.
 #2287015 by eft, DamienMcKenna: Missing deletion callback in hook_entity_info.
 #2283263 by cboyden, DamienMcKenna: Allow FPP description to be overridden.
diff --git a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.info b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.info
index 039ba354675bb768c5dfccfc081423b61b4f058a..0bf114489b1cead410f148a669d0cf7ada04f2a3 100644
--- a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.info
+++ b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.info
@@ -2,8 +2,8 @@ name = "Fieldable Panels Panes"
 description = "Allow the creation of fieldable panels pane entities."
 package = "Panels"
 core = "7.x"
-dependencies[] = ctools (>=1.6)
-dependencies[] = panels (>=3.5)
+dependencies[] = ctools (>= 1.8)
+dependencies[] = panels (>= 3.5)
 dependencies[] = views
 
 configure = admin/structure/fieldable-panels-panes
@@ -32,9 +32,9 @@ files[] = fieldable_panels_panes.info.inc
 ; Inline Entity Form integration.
 files[] = includes/FieldablePanelsPaneInlineEntityFormController.class.php
 
-; Information added by Drupal.org packaging script on 2015-05-29
-version = "7.x-1.6"
+; Information added by Drupal.org packaging script on 2015-09-02
+version = "7.x-1.7"
 core = "7.x"
 project = "fieldable_panels_panes"
-datestamp = "1432918082"
+datestamp = "1441216775"
 
diff --git a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.module b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.module
index e96881acfd98b6d0fbe961f58699c788b5de0d4a..ead851541fc8dea635534a9951117dac0a5f5741 100644
--- a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.module
+++ b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.module
@@ -672,13 +672,60 @@ function fieldable_panels_panes_ctools_plugin_directory($owner, $plugin_type) {
   }
 }
 
+/**
+ * Check if the user has 'update' access for an FPP object.
+ *
+ * @param mixed $argument
+ *
+ * @return bool
+ *   Whether or not the user has access to update an FPP object.
+ */
+function fieldable_panels_panes_check_access_update($argument) {
+  // If the argument is empty, either an empty string or an empty array, then
+  // CTools is most likely processing a deleted FPP.
+  if (empty($argument)) {
+    return FALSE;
+  }
+
+  // If the argument passed in as an array, try looking for an 'entity_id'
+  // element, it should contain the ID of the item that's needed.
+  $id = '';
+  if (is_array($argument)) {
+    if (isset($argument['entity_id'])) {
+      $id = $argument['entity_id'];
+    }
+    else {
+      $id = '';
+    }
+  }
+  else {
+    $id = $argument;
+  }
+
+  // The id should be in the format 'fpid:123', 'vid:123' or 'vuuid:123'.
+  if (empty($id) || strpos($id, ':') === FALSE) {
+    return FALSE;
+  }
+
+  // Try loading the FPP via the ID.
+  $entity = fieldable_panels_panes_load_from_subtype_force($id);
+
+  // If either the FPP couldn't be loaded, or the user does not have 'update'
+  // access to the FPP, then the visitor does not have access.
+  if (empty($entity) || !fieldable_panels_panes_access('update', $entity)) {
+    return FALSE;
+  }
+
+  // Getting to this point means that the visitor does have access to edit the
+  // FPP.
+  return TRUE;
+}
+
 /**
  * Implement CTools access form caching callback: get.
  */
 function fieldable_panels_panes_ctools_access_get($argument) {
-  list($op, $fpid) = explode(':', $argument);
-  $entity = fieldable_panels_panes_load($fpid);
-  if (empty($entity) || !fieldable_panels_panes_access('update', $entity)) {
+  if (!fieldable_panels_panes_check_access_update($argument)) {
     return;
   }
 
@@ -698,9 +745,7 @@ function fieldable_panels_panes_ctools_access_get($argument) {
  * Implement CTools access form caching callback: set.
  */
 function fieldable_panels_panes_ctools_access_set($argument, $access) {
-  list($op, $fpid) = explode(':', $argument);
-  $entity = fieldable_panels_panes_load($fpid);
-  if (empty($entity) || !fieldable_panels_panes_access('update', $entity)) {
+  if (!fieldable_panels_panes_check_access_update($argument)) {
     return;
   }
 
@@ -712,9 +757,7 @@ function fieldable_panels_panes_ctools_access_set($argument, $access) {
  * Implement CTools access form caching callback: get.
  */
 function fieldable_panels_panes_ctools_access_clear($argument) {
-  list($op, $fpid) = explode(':', $argument);
-  $entity = fieldable_panels_panes_load($fpid);
-  if (empty($entity) || !fieldable_panels_panes_access('update', $entity)) {
+  if (!fieldable_panels_panes_check_access_update($argument)) {
     return;
   }
 
@@ -797,6 +840,76 @@ function fieldable_panels_panes_load($fpid, $vid = NULL) {
   return !empty($entities) ? reset($entities) : FALSE;
 }
 
+/**
+ * Properly load the FPP entity via its subtype.
+ *
+ * @param string $subtype_name
+ *   A string combining an indicator of the type of ID, e.g. 'fpid', 'vid' or
+ *   'vuuid', and an integer ID, separated by a colon; e.g. "fpid:123".
+ *
+ * @return object
+ *   The requested FPP object.
+ */
+function fieldable_panels_panes_load_from_subtype($subtype_name) {
+  ctools_include('content');
+  $plugin = ctools_get_content_type('fieldable_panels_pane');
+
+  // Next, check to see how the subtype is configured.
+  $subtype_info = ctools_content_get_subtype($plugin, $subtype_name);
+
+  // This means we're probably in the process of creating a new one.
+  if (isset($subtype_info['bundle'])) {
+    return fieldable_panels_panes_create(array('bundle' => $subtype_info['bundle']));
+  }
+
+  // And try it this way.
+  if (isset($subtype_info['entity_id'])) {
+    return fieldable_panels_panes_load_from_subtype_force($subtype_info['entity_id']);
+  }
+
+  // Finally, try this:
+  return fieldable_panels_panes_load_from_subtype_force($subtype_name);
+}
+
+/**
+ * Properly load the entity via $subtype_name.
+ *
+ * @param string $subtype_name
+ *   A string combining an indicator of the type of ID, e.g. 'fpid', 'vid' or
+ *   'vuuid', and an integer ID, separated by a colon; e.g. "fpid:123".
+ *
+ * @return object
+ *   The requested FPP object.
+ */
+function fieldable_panels_panes_load_from_subtype_force($subtype_name) {
+  $object = NULL;
+
+  // Split the string up into the object type and the ID.
+  list($type, $id) = explode(':', $subtype_name);
+
+  // UUID integration.
+  if ($type == 'uuid' && module_exists('uuid')) {
+    $ids = entity_get_id_by_uuid('fieldable_panels_pane', array($id));
+    if ($object = entity_load('fieldable_panels_pane', $ids)) {
+      $object = reset($object);
+    }
+  }
+
+  // If the type is 'vid' then a specific FPP revision is being requested.
+  elseif ($type == 'vid') {
+    $fpid = db_query('SELECT fpid FROM {fieldable_panels_panes_revision} WHERE vid = :vid', array(':vid' => $id))->fetchField();
+    $object = fieldable_panels_panes_load($fpid, $id);
+  }
+
+  // The remaining scenario is that it's a regular FPP id, i.e. an "fpid", so
+  // just load the object.
+  else {
+    $object = fieldable_panels_panes_load($id);
+  }
+
+  return $object;
+}
+
 /**
  * Load multiple fieldable panel panes.
  *
diff --git a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/plugins/content_types/fieldable_panels_pane.inc b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/plugins/content_types/fieldable_panels_pane.inc
index 9802d0b4e65f48fb54a508cbb9175e2f2ceb6e70..383b597e67fa73f0bd3b968dfef17487a48c8017 100644
--- a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/plugins/content_types/fieldable_panels_pane.inc
+++ b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/plugins/content_types/fieldable_panels_pane.inc
@@ -23,13 +23,62 @@ function fieldable_panels_panes_fieldable_panels_pane_ctools_content_types() {
     'defaults' => array(
       'view_mode' => 'full',
     ),
-    'edit form' => 'fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form',
+
+    // Callback to load the FPP.
+    'content type' => 'fieldable_panels_panes_fieldable_panels_pane_content_type',
+
+    // Functionality for editing an FPP.
     'edit text' => t('Edit'),
+    // Form API callback.
+    'edit form' => 'fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form',
+    // Access callback.
+    'check editable' => 'fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form_access',
   );
 }
 // --------------------------------------------------------------------------
 // Callbacks, many of them automatically named, for rendering content.
 
+/**
+ * Return an individual FPP.
+ */
+function fieldable_panels_panes_fieldable_panels_pane_content_type($subtype_id, $plugin) {
+  $content_type = array();
+
+  // If an ID was passed in, try loading a corresponding FPP.
+  if (strpos($subtype_id, ':') !== FALSE) {
+    // If a specific FPP was requested, load it. Use the 'force' method to
+    // avoid inadvertently triggering an infinite loop.
+    $entity = fieldable_panels_panes_load_from_subtype_force($subtype_id);
+
+    // The FPP could be loaded, so generate its content type definition.
+    if (!empty($entity)) {
+      $content_type = _fieldable_panels_panes_custom_content_type($entity);
+    }
+
+    // This shouldn't happen, but there may be situations where the FPP has been
+    // deleted but is still referenced in a Panels display.
+    else {
+      return $content_type;
+    }
+  }
+
+  // If nothing was loaded yet,
+  if (empty($content_type)) {
+    $type = 'fieldable_panels_pane';
+    $subtypes = ctools_content_get_subtypes($type);
+    if (isset($subtypes[$subtype_id])) {
+      $content_type = $subtypes[$subtype_id];
+    }
+    // If there's only 1 and we somehow have the wrong subtype ID, do not
+    // care. Return the proper subtype anyway.
+    if (empty($content_type) && !empty($plugin['single'])) {
+      $content_type = current($subtypes);
+    }
+  }
+
+  return $content_type;
+}
+
 /**
  * Callback to return the custom content types with the specified $subtype_name.
  */
@@ -39,7 +88,7 @@ function fieldable_panels_panes_fieldable_panels_pane_content_type_content_type(
     return $types[$subtype_name];
   }
   else {
-    $entity = fieldable_panels_panes_load_entity($subtype_name);
+    $entity = fieldable_panels_panes_load_from_subtype($subtype_name);
     if (!empty($entity)) {
       return _fieldable_panels_panes_custom_content_type($entity);
     }
@@ -70,7 +119,7 @@ function fieldable_panels_panes_fieldable_panels_pane_content_type_content_types
  * Callback to render our content type.
  */
 function fieldable_panels_panes_fieldable_panels_pane_content_type_render($subtype, $conf, $panel_args = array(), $context = array()) {
-  $entity = fieldable_panels_panes_load_entity($subtype);
+  $entity = fieldable_panels_panes_load_from_subtype($subtype);
   if (!empty($entity) && !empty($entity->fpid) && fieldable_panels_panes_access('view', $entity)) {
     $view_mode = isset($conf['view_mode']) ? $conf['view_mode'] : 'full';
     $settings = field_bundle_settings('fieldable_panels_pane', $entity->bundle);
@@ -106,7 +155,7 @@ function fieldable_panels_panes_fieldable_panels_pane_content_type_render($subty
  * Callback to provide the administrative title of the custom content.
  */
 function fieldable_panels_panes_fieldable_panels_pane_content_type_admin_title($subtype, $conf) {
-  $entity = fieldable_panels_panes_load_entity($subtype);
+  $entity = fieldable_panels_panes_load_from_subtype($subtype);
 
   if (!empty($entity) && is_object($entity)) {
     $output = !empty($entity->admin_title) ? $entity->admin_title : (!empty($entity->title) ? $entity->title : t('No title'));
@@ -132,7 +181,7 @@ function fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form($fo
   $conf = &$form_state['conf'];
 
   if (!isset($form_state['entity'])) {
-    $form_state['entity'] = fieldable_panels_panes_load_entity($form_state['subtype_name']);
+    $form_state['entity'] = fieldable_panels_panes_load_from_subtype($form_state['subtype_name']);
   }
   $entity = $form_state['entity'];
 
@@ -220,6 +269,13 @@ function fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form_sub
   $form_state['pane']->subtype = $entity_id;
 }
 
+/**
+ * Callback for the 'edit' permission.
+ */
+function fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form_access($content_type, $subtype, $view_mode = 'full') {
+  return fieldable_panels_panes_check_access_update($subtype);
+}
+
 // --------------------------------------------------------------------------
 // Internal methods used by the above callbacks.
 
@@ -274,52 +330,6 @@ function _fieldable_panels_panes_custom_content_type($entity) {
   return $info;
 }
 
-/**
- * Properly load the entity the subtype.
- */
-function fieldable_panels_panes_load_entity($subtype_name) {
-  ctools_include('content');
-  $plugin = ctools_get_content_type('fieldable_panels_pane');
-
-  // Next, check to see how the subtype is configured.
-  $subtype_info = ctools_content_get_subtype($plugin, $subtype_name);
-
-  // This means we're probably in the process of creating a new one.
-  if (isset($subtype_info['bundle'])) {
-    return fieldable_panels_panes_create(array('bundle' => $subtype_info['bundle']));
-  }
-
-  // And try it this way.
-  if (isset($subtype_info['entity_id'])) {
-    return _fieldable_panels_panes_load_entity($subtype_info['entity_id']);
-  }
-
-  // Finally, try this:
-  return _fieldable_panels_panes_load_entity($subtype_name);
-}
-
-/**
- * Properly load the entity via $subtype_name
- */
-function _fieldable_panels_panes_load_entity($subtype_name) {
-  list($type, $id) = explode(':', $subtype_name);
-  if ($type == 'uuid' && module_exists('uuid')) {
-    $ids = entity_get_id_by_uuid('fieldable_panels_pane', array($id));
-    if ($content = entity_load('fieldable_panels_pane', $ids)) {
-      $content = reset($content);
-    }
-  }
-  elseif ($type == 'vid') {
-    $fpid = db_query('SELECT fpid FROM {fieldable_panels_panes_revision} WHERE vid = :vid', array(':vid' => $id))->fetchField();
-    $content = fieldable_panels_panes_load($fpid, $id);
-  }
-  else {
-    $content = fieldable_panels_panes_load($id);
-  }
-
-  return $content;
-}
-
 /**
  * Access callback for creating a new content type.
  */
diff --git a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.module b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.module
index 08b83931b20aa84866905bb2aa2de7b49973decf..1eca7e218bc7421ffbba5b973c5d4d32018ce634 100644
--- a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.module
+++ b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.module
@@ -102,7 +102,7 @@ function ocio_main_menu_menu() {
     'title' => 'Help',
     'description' => t('Documentation for using this site.'),
     'page callback' => 'drupal_goto',
-    'page arguments' => array('https://it.osu.edu/assist/OCIODrupalDistribution/index.html'),
+    'page arguments' => array('https://it.osu.edu/assist/wcm'),
     'access arguments' => array('access administration pages'),
     'weight' => 50,
   );
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.module b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.module
index 0ec0269b5ea89254b0ca4b1b22ee40a043796608..9122f70f1e5a4f9e32fe7e9b9eff0435a5229424 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.module
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.module
@@ -20,7 +20,6 @@ function wcm_user_profile_user_view_alter(&$build) {
   $access = $dir || $lead;
 
   global $user;
-
   if (!($access || $user->uid == $account->uid || user_access('view user profiles'))) {
     drupal_set_breadcrumb('');
     drupal_access_denied();
@@ -31,4 +30,19 @@ function wcm_user_profile_user_view_alter(&$build) {
   if ($lead) {
     $build['#view_mode'] = 'leadership_listing';
   }
+
+  global $base_url;
+
+  $user_paths = array('leadership', 'contact');
+
+  // If user profile is accessed from the above pages, modify breadcrumb
+  foreach ($user_paths as $path) {
+    if ($_SERVER['HTTP_REFERER'] == $base_url . '/'. $path) {
+      $breadcrumb = drupal_get_breadcrumb();
+      $breadcrumb[2] = $breadcrumb[1];
+      $breadcrumb[1] = l(ucfirst($path), '/' . $path);
+      drupal_set_breadcrumb($breadcrumb);
+      break;
+    }
+  }
 }
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
index 849836196553de691578e3e62ef7c88580b7b386..ebca3e4e72b76839b25439171d6c7782e124f637 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
@@ -1704,6 +1704,7 @@ p.search-result__snippet {
 .panel-pane.pane-bundle-tile-pane .fieldable-panels-pane .field--name-field-tile-background-img img,
 .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane .field--name-field-tile-background-img img {
   display: block;
+  width: 100%;
 }
 
 .panel-pane.pane-bundle-tile-pane .fieldable-panels-pane a {
@@ -1870,9 +1871,11 @@ p.search-result__snippet {
 .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane p, .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane li {
   font-size: 13px;
   font-size: 1.3rem;
-  line-height: 150%;
   font-weight: 300;
 }
+.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane p, .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane ol, .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane ul {
+  margin: 1em 0 0 0;
+}
 .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane li {
   text-align: left;
   margin-left: -2em;
@@ -1903,7 +1906,7 @@ p.search-result__snippet {
   color: #2d2d2d;
 }
 .panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon {
-  display: table;
+  display: block;
   padding: 1.4em 1.4em 1em;
 }
 .panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon .field--name-field-tile-background-img {
@@ -1922,13 +1925,10 @@ p.search-result__snippet {
   text-align: left;
 }
 .panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon .field--name-field-tile-background-img + h2 + .text-areas {
-  display: table-caption;
-  caption-side: bottom;
+  display: inline-block;
+  width: 100%;
   background: inherit;
 }
-.panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon .field--name-field-tile-background-img + h2 + .text-areas p {
-  padding-bottom: 1em;
-}
 .panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon .text-areas {
   padding: 0;
 }
@@ -2271,7 +2271,10 @@ div.workbench-info-block #edit-submit {
   margin-left: -0.9em;
 }
 .l-region--main-menu ul.sf-main-menu ul li {
-  padding: 0.75em 0.9em;
+  padding: 0;
+}
+.l-region--main-menu ul.sf-main-menu ul li a {
+  padding: 0.75em 0.9em 0.65em;
 }
 .l-region--main-menu ul li:hover > ul {
   display: block;
@@ -2724,13 +2727,15 @@ div.workbench-info-block #edit-submit {
 .l-region--main-menu.mean-container .mean-nav {
   margin-top: 4em;
 }
+.l-region--main-menu.mean-container .mean-nav ul li {
+  text-transform: uppercase;
+}
 .l-region--main-menu.mean-container .mean-nav ul li li {
   display: block;
   float: left;
   width: 100%;
   margin: 0;
   text-align: left;
-  text-transform: uppercase;
   font-weight: 500;
   box-sizing: border-box;
   background: rgba(0, 0, 0, 0.1);
@@ -2745,6 +2750,7 @@ div.workbench-info-block #edit-submit {
   border: 0 none;
   box-sizing: border-box;
   width: 100%;
+  display: block;
 }
 .l-region--main-menu.mean-container .mean-nav ul li li a {
   padding-left: 3em;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
index 57f0da3726313dc3bc14b3cafc8ee68cf58c10c6..ce3cbca2099fddeeb33c4704932f4f1f844dffdb 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
@@ -1718,6 +1718,7 @@ p.search-result__snippet {
 .panel-pane.pane-bundle-tile-pane .fieldable-panels-pane .field--name-field-tile-background-img img,
 .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane .field--name-field-tile-background-img img {
   display: block;
+  width: 100%;
 }
 
 .panel-pane.pane-bundle-tile-pane .fieldable-panels-pane a {
@@ -1885,9 +1886,11 @@ p.search-result__snippet {
 .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane p, .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane li {
   font-size: 13px;
   font-size: 1.3rem;
-  line-height: 150%;
   font-weight: 300;
 }
+.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane p, .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane ol, .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane ul {
+  margin: 1em 0 0 0;
+}
 .panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane li {
   text-align: left;
   margin-left: -2em;
@@ -1918,7 +1921,7 @@ p.search-result__snippet {
   color: #2d2d2d;
 }
 .panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon {
-  display: table;
+  display: block;
   padding: 1.4em 1.4em 1em;
 }
 .panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon .field--name-field-tile-background-img {
@@ -1937,13 +1940,10 @@ p.search-result__snippet {
   text-align: left;
 }
 .panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon .field--name-field-tile-background-img + h2 + .text-areas {
-  display: table-caption;
-  caption-side: bottom;
+  display: inline-block;
+  width: 100%;
   background: inherit;
 }
-.panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon .field--name-field-tile-background-img + h2 + .text-areas p {
-  padding-bottom: 1em;
-}
 .panel-pane.pane-bundle-tile-pane-plus-text-area .tile-image-style-icon .text-areas {
   padding: 0;
 }
@@ -2311,7 +2311,10 @@ div.workbench-info-block #edit-submit {
   margin-left: -0.9em;
 }
 .l-region--main-menu ul.sf-main-menu ul li {
-  padding: 0.75em 0.9em;
+  padding: 0;
+}
+.l-region--main-menu ul.sf-main-menu ul li a {
+  padding: 0.75em 0.9em 0.65em;
 }
 .l-region--main-menu ul li:hover > ul {
   display: block;
@@ -2764,13 +2767,15 @@ div.workbench-info-block #edit-submit {
 .l-region--main-menu.mean-container .mean-nav {
   margin-top: 4em;
 }
+.l-region--main-menu.mean-container .mean-nav ul li {
+  text-transform: uppercase;
+}
 .l-region--main-menu.mean-container .mean-nav ul li li {
   display: block;
   float: left;
   width: 100%;
   margin: 0;
   text-align: left;
-  text-transform: uppercase;
   font-weight: 500;
   box-sizing: border-box;
   background: rgba(0, 0, 0, 0.1);
@@ -2785,6 +2790,7 @@ div.workbench-info-block #edit-submit {
   border: 0 none;
   box-sizing: border-box;
   width: 100%;
+  display: block;
 }
 .l-region--main-menu.mean-container .mean-nav ul li li a {
   padding-left: 3em;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js b/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js
index 10c70b8fa0eb27429a9e58ac7096eb325b072e7e..5ddbb46b08cec2309bd0502267a298c29b1c7912 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js
+++ b/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js
@@ -52,8 +52,26 @@
 
       if ($.fn.matchHeight) {
         /* Match tile panes to equal height */
-        var tiles = $('.node-type-ocio-landing-page .row-tiles .tile-panel .fieldable-panels-pane');
-        tiles.find('.title-box, .text-areas').matchHeight();
+        var rows = $('.node-type-ocio-landing-page .row-tiles .row-fluid');
+        rows.each(function() {
+          var resize = true;
+
+          var row = $(this);
+          var regions = row.find('.tile-panel');
+          regions.each(function(row){
+
+            if ($(this).find('.fieldable-panels-pane').size() > 1 ) {
+              resize = false;
+              return false;
+            }
+          });
+
+          if (resize) {
+            var panes = row.find('.tile-panel .fieldable-panels-pane');
+            panes.find('.text-areas, .title-box').matchHeight({byRow: false});
+            panes.matchHeight({byRow: false});
+          }
+        });
       }
 
       var toggleButton      = $('#search-block-toggle').eq(0);
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
index 828f8b7fef74075b238938bc43b49d8e8cdbe5d2..25ea5b2675bd51b27ac865234deaae36f8d3f862 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
@@ -22,6 +22,7 @@
 
     .field--name-field-tile-background-img img {
       display: block;
+      width: 100%;
     }
   }
 }
@@ -139,10 +140,13 @@
 
     p, li {
       @include font-size(1.3);
-      line-height: 150%;
       font-weight: 300;
     }
 
+    p, ol, ul {
+      margin: 1em 0 0 0;
+    }
+
     li {
       text-align: left;
       margin-left: -2em;
@@ -169,7 +173,7 @@
   }
 
   .tile-image-style-icon {
-    display: table;
+    display: block;
     padding: 1.4em 1.4em 1em;
 
     .field--name-field-tile-background-img {
@@ -189,13 +193,9 @@
         text-align: left;
 
         & + .text-areas {
-          display: table-caption;
-          caption-side: bottom;
+          display: inline-block;
+          width: 100%;
           background: inherit;
-
-          p {
-            padding-bottom: 1em;
-          }
         }
       }
     }
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_main-menu.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_main-menu.scss
index e36fffc3789428586ad5dc5eb1555b0dce84e20c..3cde25fd60c047cbc9b70d8122d8894864c7a118 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_main-menu.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_main-menu.scss
@@ -52,7 +52,11 @@
       margin-left: -0.9em;
 
       li {
-        padding: 0.75em 0.9em;
+        padding: 0;
+
+        a {
+          padding: 0.75em 0.9em 0.65em;
+        }
       }
     }
   }
@@ -344,13 +348,14 @@
       margin-top: 4em;
 
       ul li {
+        text-transform: uppercase;
+
         li {
           display: block;
           float: left;
           width: 100%;
           margin: 0;
           text-align: left;
-          text-transform: uppercase;
           font-weight: 500;
           box-sizing: border-box;
           background: rgba(0, 0, 0, 0.1);
@@ -366,6 +371,7 @@
           border: 0 none;
           box-sizing: border-box;
           width: 100%;
+          display: block;
         }
 
         li a {
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index 059ee527693ebaf55b31539b5a30f89014a9d8aa..307de90d1c16826af51adb53e264415ff1bde552 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -41,7 +41,7 @@ projects[features][patch][986968] = https://drupal.org/files/issues/export_shorc
 projects[features_extra][version] = 1.0-beta1
 projects[features_extra][subdir] = contrib
 
-projects[fieldable_panels_panes][version] = 1.6
+projects[fieldable_panels_panes][version] = 1.7
 projects[fieldable_panels_panes][subdir] = contrib
 
 projects[media][version] = 2.0-beta1