diff --git a/extensions/b2g/viewer.html b/extensions/b2g/viewer.html
index f8a24fc97..3724b4e24 100644
--- a/extensions/b2g/viewer.html
+++ b/extensions/b2g/viewer.html
@@ -22,9 +22,8 @@ limitations under the License.
 
 
     <link rel="stylesheet" href="viewer.css"/>
-    <link rel="resource" type="application/l10n" href="locale.properties"/>
+    <link rel="resource" type="application/l10n" href="locale/locale.properties"/>
     <link rel="stylesheet" href="/shared/style/headers.css" type="text/css" />
-    <link rel="stylesheet" href="viewer-b2g.css" type="text/css" />
     <script type="text/javascript" src="l10n.js"></script>
     <script type="text/javascript" src="../build/pdf.js"></script>
     <script type="text/javascript" src="/shared/js/async_storage.js"></script>
@@ -123,6 +122,10 @@ limitations under the License.
             <span data-l10n-id="download_label">Download</span>
           </button>
 
+          <a href="#" id="secondaryViewBookmark" class="secondaryToolbarButton bookmark visibleSmallView" title="Current view (copy or open in new window)" tabindex="22" data-l10n-id="bookmark">
+              <span data-l10n-id="bookmark_label">Current View</span>
+          </a>
+
           <div class="horizontalToolbarSeparator visibleLargeView"></div>
 
           <button id="firstPage" class="secondaryToolbarButton firstPage" title="Go to First Page" tabindex="22" data-l10n-id="first_page">
@@ -200,6 +203,24 @@ limitations under the License.
         </menu>
 
       </div> <!-- mainContainer -->
+
+      <div id="overlayContainer" class="hidden">
+        <div id="promptContainer">
+          <div id="passwordContainer" class="prompt doorHanger">
+            <div class="row">
+              <p id="passwordText" data-l10n-id="password_label">Enter the password to open this PDF file:</p>
+            </div>
+            <div class="row">
+              <input type="password" id="password" class="toolbarField" />
+            </div>
+            <div class="row">
+              <button id="passwordCancel" class="promptButton"><span data-l10n-id="password_cancel">Cancel</span></button>
+              <button id="passwordSubmit" class="promptButton"><span data-l10n-id="password_ok">OK</span></button>
+            </div>
+          </div>
+        </div>
+      </div>
+
       <div id="printContainer"></div>
     </div>
     <!-- END STUBS -->
diff --git a/make.js b/make.js
index 02142b2b7..ca6c77181 100644
--- a/make.js
+++ b/make.js
@@ -33,6 +33,7 @@ var ROOT_DIR = __dirname + '/', // absolute path to project's root
     BUILD_TARGETS = [BUILD_TARGET, BUILD_WORKER_TARGET],
     FIREFOX_BUILD_DIR = BUILD_DIR + '/firefox/',
     CHROME_BUILD_DIR = BUILD_DIR + '/chromium/',
+    B2G_BUILD_DIR = BUILD_DIR + '/b2g/',
     EXTENSION_SRC_DIR = 'extensions/',
     LOCALE_SRC_DIR = 'l10n/',
     GH_PAGES_DIR = BUILD_DIR + 'gh-pages/',
@@ -127,6 +128,7 @@ target.generic = function() {
 target.web = function() {
   target.generic();
   target.extension();
+  target.b2g();
 
   echo();
   echo('### Creating web site');
@@ -139,6 +141,7 @@ target.web = function() {
   mkdir('-p', GH_PAGES_DIR + BUILD_DIR);
   mkdir('-p', GH_PAGES_DIR + EXTENSION_SRC_DIR + '/firefox');
   mkdir('-p', GH_PAGES_DIR + EXTENSION_SRC_DIR + '/chromium');
+  mkdir('-p', GH_PAGES_DIR + EXTENSION_SRC_DIR + '/b2g');
 
   cp('-R', GENERIC_DIR + '/*', GH_PAGES_DIR);
   cp(FIREFOX_BUILD_DIR + '/*.xpi', FIREFOX_BUILD_DIR + '/*.rdf',
@@ -147,6 +150,7 @@ target.web = function() {
      GH_PAGES_DIR + EXTENSION_SRC_DIR + 'chromium/');
   cp('web/index.html.template', GH_PAGES_DIR + '/index.html');
   cp('-R', 'test/features', GH_PAGES_DIR);
+  cp('-R', B2G_BUILD_DIR, GH_PAGES_DIR + EXTENSION_SRC_DIR + 'b2g/');
 
   cd(GH_PAGES_DIR);
   exec('git init');
@@ -602,8 +606,7 @@ target.b2g = function() {
 
   echo();
   echo('### Building B2G (Firefox OS App)');
-  var B2G_BUILD_DIR = BUILD_DIR + '/b2g/',
-      B2G_BUILD_CONTENT_DIR = B2G_BUILD_DIR + '/content/';
+  var B2G_BUILD_CONTENT_DIR = B2G_BUILD_DIR + '/content/';
   var defines = builder.merge(DEFINES, { B2G: true });
   target.bundle({ defines: defines });
 
diff --git a/web/viewer.css b/web/viewer.css
index 84fa2b7a7..c0948a788 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -20,6 +20,8 @@
 
 html {
   height: 100%;
+  /* Font size is needed to make the activity bar the corect size. */
+  font-size: 10px;
 }
 
 body {
@@ -167,6 +169,7 @@ html[dir='rtl'] .innerCenter {
 #outerContainer {
   width: 100%;
   height: 100%;
+  position: relative;
 }
 
 #sidebarContainer {