diff --git a/modules/embedlinks/controllers/admin_embedlinks.php b/modules/embedlinks/controllers/admin_embedlinks.php
new file mode 100644
index 00000000..1753ec3a
--- /dev/null
+++ b/modules/embedlinks/controllers/admin_embedlinks.php
@@ -0,0 +1,80 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class Admin_EmbedLinks_Controller extends Admin_Controller {
+  public function index() {
+    // Generate a new admin page.
+    $view = new Admin_View("admin.html");
+    $view->content = new View("admin_embedlinks.html");
+    $view->content->embedlinks_form = $this->_get_admin_form();
+    print $view;
+  }
+
+  public function saveprefs() {
+    // Prevent Cross Site Request Forgery
+    access::verify_csrf();
+
+    // Figure out which boxes where checked
+    $linkOpts_array = Input::instance()->post("LinkCodeTypeOptions");
+    $HTMLButton = false;
+    $BBCodeButton = false;
+        
+    for ($i = 0; $i < count($linkOpts_array); $i++) {
+      if ($linkOpts_array[$i] == "HTMLCode") {
+        $HTMLButton = true;
+      }
+      if ($linkOpts_array[$i] == "BBCode") {
+        $BBCodeButton = true;
+      }
+    }
+          
+    // Save Settings.
+    module::set_var("embedlinks", "HTMLCode", $HTMLButton);
+    module::set_var("embedlinks", "BBCode", $BBCodeButton);
+    message::success(t("Your Selection Has Been Saved."));
+    
+    // Load Admin page.
+    $view = new Admin_View("admin.html");
+    $view->content = new View("admin_embedlinks.html");
+    $view->content->embedlinks_form = $this->_get_admin_form();
+    print $view;
+  }
+
+  private function _get_admin_form() {
+    // Make a new Form.
+    $form = new Forge("admin/embedlinks/saveprefs", "", "post",
+                      array("id" => "gEmbedLinksAdminForm"));
+
+    // Make an array for the different types of link codes.
+    $linkCodes["HTMLCode"] = array("Show HTML Links", module::get_var("embedlinks", "HTMLCode"));
+    $linkCodes["BBCode"] = array("Show BBCode Links", module::get_var("embedlinks", "BBCode"));
+
+    // Setup a few checkboxes on the form.
+    $add_links = $form->group("EmbedLinks");
+    $add_links->checklist("LinkCodeTypeOptions")
+      ->options($linkCodes);
+
+    // Add a save button to the form.
+    $add_links->submit("SaveSettings")->value(t("Save"));
+
+    // Return the newly generated form.
+    return $form;
+  }
+}
\ No newline at end of file
diff --git a/modules/embedlinks/helpers/embedlinks_menu.php b/modules/embedlinks/helpers/embedlinks_menu.php
new file mode 100644
index 00000000..64698e7f
--- /dev/null
+++ b/modules/embedlinks/helpers/embedlinks_menu.php
@@ -0,0 +1,28 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class embedlinks_menu_Core {
+  static function admin($menu, $theme) {
+    $menu->get("settings_menu")
+      ->append(Menu::factory("link")
+               ->id("embedlinks")
+               ->label(t("EmbedLinks"))
+               ->url(url::site("admin/embedlinks")));
+  }
+}
diff --git a/modules/embedlinks/helpers/embedlinks_theme.php b/modules/embedlinks/helpers/embedlinks_theme.php
index 9ded90de..cf88677b 100644
--- a/modules/embedlinks/helpers/embedlinks_theme.php
+++ b/modules/embedlinks/helpers/embedlinks_theme.php
@@ -27,12 +27,12 @@ class embedlinks_theme_Core {
       return $block;
     }
   }
-  static function photo_bottom($theme) {
-      $block = new Block();
-      $block->css_id = "gMetadata";
-      $block->title = t("Links");
-      $block->content = new View("embedlinks_photo_block.html");
-      return $block;
+  
+  static function photo_bottom($theme) { 
+    $block = new Block();
+    $block->css_id = "gMetadata";
+    $block->title = t("Links");
+    $block->content = new View("embedlinks_photo_block.html");
+    return $block;
   }
-
 }
diff --git a/modules/embedlinks/module.info b/modules/embedlinks/module.info
index a1636ff9..de716d1a 100644
--- a/modules/embedlinks/module.info
+++ b/modules/embedlinks/module.info
@@ -1,3 +1,3 @@
 name = EmbedLinks
-description = Display HTML code to embed links to albums/images into other web pages.
+description = Display BBCode and HTML code to embed links to albums/images into other web pages.
 version = 1
diff --git a/modules/embedlinks/views/admin_embedlinks.html.php b/modules/embedlinks/views/admin_embedlinks.html.php
new file mode 100644
index 00000000..060ded3a
--- /dev/null
+++ b/modules/embedlinks/views/admin_embedlinks.html.php
@@ -0,0 +1,5 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="gEmbedLinksAdmin">
+  <h2> <?= t("EmbedLinks") ?> </h2>
+  <?= $embedlinks_form ?>
+</div>
diff --git a/modules/embedlinks/views/embedlinks_album_block.html.php b/modules/embedlinks/views/embedlinks_album_block.html.php
index 63ccbe4e..dafca2ec 100644
--- a/modules/embedlinks/views/embedlinks_album_block.html.php
+++ b/modules/embedlinks/views/embedlinks_album_block.html.php
@@ -1,4 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<? if (module::get_var("embedlinks", "HTMLCode")) { ?>
 <table class="gMetadata">
   <tbody>
     <tr>
@@ -16,7 +17,9 @@
     </tr>
   </tbody>
 </table>
+<? } ?>
 
+<? if (module::get_var("embedlinks", "BBCode")) { ?>
 <table class="gMetadata">
   <tbody>
     <tr>
@@ -34,3 +37,4 @@
     </tr>
   </tbody>
 </table>
+<? } ?>
diff --git a/modules/embedlinks/views/embedlinks_photo_block.html.php b/modules/embedlinks/views/embedlinks_photo_block.html.php
index 7053dfcc..9d50c32a 100644
--- a/modules/embedlinks/views/embedlinks_photo_block.html.php
+++ b/modules/embedlinks/views/embedlinks_photo_block.html.php
@@ -1,5 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-
+      
+<? if (module::get_var("embedlinks", "HTMLCode")) { ?>
 <h3 align="center"><?= t("HTML Links")?></h3>
 <table class="gMetadata">
   <tbody>
@@ -24,7 +25,7 @@
 
 <?  if (access::can("view_full", $item)) { ?>
     <tr>
-      <th colspan="2"><br/><?= t("Link To Fullsize Image:") ?></th>
+      <th colspan="2"><br/><?= t("Link To The Fullsize Image:") ?></th>
     </tr>
 
     <tr>
@@ -44,7 +45,7 @@
 <? } ?>
 
     <tr>
-      <th colspan="2"><br/><?= t("Link To Resized Image:") ?></th>
+      <th colspan="2"><br/><?= t("Link To The Resized Image:") ?></th>
     </tr>
 
     <tr>
@@ -64,8 +65,9 @@
 
   </tbody>
 </table>
+<? } ?>
 
-
+<? if (module::get_var("embedlinks", "BBCode")) { ?>
 <h3 align="center"><?= t("BBCode Links")?></h3>
 <table class="gMetadata">
   <tbody>
@@ -90,7 +92,7 @@
 
 <?  if (access::can("view_full", $item)) { ?>
     <tr>
-      <th colspan="2"><br/><?= t("Link To Fullsize Image:") ?></th>
+      <th colspan="2"><br/><?= t("Link To The Fullsize Image:") ?></th>
     </tr>
 
     <tr>
@@ -110,7 +112,7 @@
 <? } ?>
 
     <tr>
-      <th colspan="2"><br/><?= t("Link To Resized Image:") ?></th>
+      <th colspan="2"><br/><?= t("Link To The Resized Image:") ?></th>
     </tr>
 
     <tr>
@@ -130,3 +132,4 @@
 
   </tbody>
 </table>
+<? } ?>
\ No newline at end of file