diff --git a/app/index.html b/app/index.html
index 82479c09c0..4c2d83f60d 100644
--- a/app/index.html
+++ b/app/index.html
@@ -42,7 +42,7 @@
         </div>
         <div id="bootstrap-app" class="hidden">
 
-            <mode-bar embed-only=false current-user="currentUser"></mode-bar>
+            <mode-bar current-user="currentUser"></mode-bar>
             <ui-view></ui-view>
 
             <!-- TODO: fix and uncomment
diff --git a/app/main/posts/detail/post-detail-data.directive.js b/app/main/posts/detail/post-detail-data.directive.js
index 8d4059316a..53c6401b1b 100644
--- a/app/main/posts/detail/post-detail-data.directive.js
+++ b/app/main/posts/detail/post-detail-data.directive.js
@@ -61,8 +61,11 @@ function PostDetailDataController(
     $scope.$watch('post', function (post) {
         activate();
     });
+    /* need to check for embed here to set the correct class
+    * if coming from map to detail-view in embed, TODO: should go to a service! */
+    var isEmbed = ($window.self !== $window.top) ? true : false;
+    isEmbed ? $rootScope.setLayout('layout-d layout-embed') : $rootScope.setLayout('layout-d');
 
-    $rootScope.setLayout('layout-d');
     $scope.post = $scope.post;
     $scope.post_task = {};
     $scope.hasPermission = $rootScope.hasPermission;
diff --git a/app/main/posts/views/filter-by-survey.html b/app/main/posts/views/filter-by-survey.html
index d69b711956..84a99a83a2 100644
--- a/app/main/posts/views/filter-by-survey.html
+++ b/app/main/posts/views/filter-by-survey.html
@@ -1,3 +1,3 @@
-<div embed-only="true" class="toolbox hide-when-medium">
+<div class="embed-survey-filter" embed-only="true" class="toolbox hide-when-medium">
     <button ng-click="openFilters()" class="button-beta button-plain mode-context-trigger" translate="app.filter_by_survey">Filter by survey</button>
 </div>
diff --git a/app/main/posts/views/post-toolbar.html b/app/main/posts/views/post-toolbar.html
index 2f8b3ca0f0..84402d04c9 100644
--- a/app/main/posts/views/post-toolbar.html
+++ b/app/main/posts/views/post-toolbar.html
@@ -19,18 +19,22 @@
         </div>
     </div>
 
-    <filter-by-survey></filter-by-survey>
-    <div class="button-group hide-until-medium" embed-only="true" ng-hide="filtersActive">
-        <div ng-if="!editMode()">
-            <post-share filters="filters" button="true"></post-share>
-            <button ng-if="editEnabled()" class="button button-alpha" ng-click="setEditMode()" translate>app.edit</button>
-        </div>
+    <div embed-only="true" class="hide-until-medium">
+        <filter-posts filters="filters" on-open="hideOtherActions()" on-close="showOtherActions()"></filter-posts>
+        <div class="button-group">
+            <div ng-hide="filtersActive">
+                <div ng-if="!editMode()">
+                    <post-share filters="filters" button="true"></post-share>
+                    <button ng-if="editEnabled()" class="button button-alpha" ng-click="setEditMode()" translate>app.edit</button>
+                </div>
 
-        <div ng-if="editMode()">
-            <button ng-if="hasPermission" class="button" ng-click="cancel()" translate>app.cancel</button>
-             <button ng-if="hasPermission && !isSaving()" ng-click="savePost()" class=" button button-alpha" translate>app.save</button>
-            <loading-dots button-class="'button-alpha'" disabled=true label="'app.saving'" ng-if="isSaving()"></loading-dots>
+                <div ng-if="editMode()">
+                    <button ng-if="hasPermission" class="button" ng-click="cancel()" translate>app.cancel</button>
+                    <button ng-if="hasPermission && !isSaving()" ng-click="savePost()" class=" button button-alpha" translate>app.save</button>
+                </div>
+            </div>
         </div>
+        <loading-dots button-class="'button-alpha'" disabled=true label="'app.saving'" ng-if="isSaving()"></loading-dots>
     </div>
 
     <!-- toolbar -->
@@ -39,4 +43,4 @@
             ..
         </span>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/main/posts/views/post-view-data.html b/app/main/posts/views/post-view-data.html
index 88228e48e9..bfa8a96659 100644
--- a/app/main/posts/views/post-view-data.html
+++ b/app/main/posts/views/post-view-data.html
@@ -1,4 +1,12 @@
+<!-- Below code is used to get the header to embeds -->
+<div class="mode-context init" embed-only="true" ng-controller="navigation as nav" dropdown>
+    <header class="mode-context-header" ng-class="{ 'has-logo' : nav.site.image_header }">
+      <h1 class="mode-context-title"><a href="/" ng-bind="nav.site.name"></a></h1>
+      <img ng-if="nav.site.image_header" ng-src="{{ nav.site.image_header }}" class="deployment-logo" />
+    </header>
+</div>
 <main role="main">
+
 <div class="flex-container">
     <layout-class layout="d"></layout-class>
     <post-toolbar selected-post="selectedPost.post" filters="filters"></post-toolbar>
diff --git a/package.json b/package.json
index 57363faa95..1c8112e864 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "nvd3": "^1.8.4",
     "socket.io-client": "2.0.3",
     "underscore": "^1.7.0",
-    "ushahidi-platform-pattern-library": "v3.7.2-rc.24"
+    "ushahidi-platform-pattern-library": "3.7.2-rc.31"
   },
   "engines": {
     "node": ">=4.0"