diff --git a/modules/digibug/css/digibug.css b/modules/digibug/css/digibug.css
deleted file mode 100644
index a09e4551..00000000
--- a/modules/digibug/css/digibug.css
+++ /dev/null
@@ -1,91 +0,0 @@
-.gAdminDigibugIntro {
-  background-image: url(logo.png);
-  background-repeat: no-repeat;
-  padding-bottom: 20px;
-  width: 820px;
-}
-
-.gAdminDigibugIntro p {
-  font-family: Trebuchet MS,Arial,Verdana,Helvetica,sans-serif;
-  font-size: 1.3em;
-  font-weight: bold;
-  padding-left: 110px;
-  padding-top: 15px;
-}
-
-.gDigibugTab {
-  width: 820px;
-  height: 420px;
-}
-
-.gDigibugTab .gDigibugTitle {
-  font-family: Georgia;
-  font-size: 20px;
-  font-weight: bold;
-  padding-bottom: 10px;
-}
-
-.gDigibugTab .gDigibugText {
-  font-size: 12px;
-  font-weight: bold;
-  line-height: 17px;
-  padding-bottom: 15px;
-}
-
-.gDigibugListItems ul {
-  list-style-type: disc;
-  padding-left: 20px;
-  font-size: 12px;
-  font-weight: bold;
-  line-height: 15px;
-}
-
-.gDigibugListItems ul li{
-  padding-top: 10px;
-}
-
-.gDigibugRounded {
-  background-color:#5C9CCC;
-  color: white;
-  width: 308px;
-  height: 45px;
-  text-align: center;
-  line-height: 15px;
-  margin-top: 10px;
-  font-weight: bold;
-  font-size: 12px;
-  margin-left: 60px;
-  margin-right: -50px;
-  margin-left: 20px;
-  margin-right: 0px;
-}
-
-.gDigibugRounded a {
-  color: white !important;
-  font-weight: bold;
-  text-decoration: underline;
-}
-
-.gDigibugSignIn {
-  width: 115px;
-  float: left;
-}
-
-.gDigibugSignIn a {
-  color: black;
-  font-size: 16px;
-  font-weight: bold;
-  text-decoration: underline;
-}
-
-.gDigibugAdvancedForm {
-  float: left;
-  padding-left: 30px;
-  width: 180px;
-}
-
-.gDigibugPrintButton {
-  float: left;
-}
-
-
diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php
index 6c466031..d9baf59c 100644
--- a/modules/digibug/helpers/digibug_menu.php
+++ b/modules/digibug/helpers/digibug_menu.php
@@ -22,7 +22,7 @@ class digibug_menu {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
         ->id("digibug_menu")
-        ->label(t("Digibug Administration"))
+        ->label(t("Digibug"))
         ->url(url::site("admin/digibug")));
   }
 
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index e52fcc7f..bd269256 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -19,15 +19,7 @@
  */
 class digibug_theme_Core {
   static function head($theme) {
-    $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
-      url::file("modules/digibug/css/digibug.css") . "\" />";
-    $head[] = html::script("modules/digibug/js/digibug.js");;
-    return implode("\n", $head);
-  }
-
-  static function admin_head($theme) {
-    return "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
-      url::file("modules/digibug/css/digibug.css") . "\" />";
+    return html::script("modules/digibug/js/digibug.js");
   }
 
   static function thumb_bottom($theme, $child) {
diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php
index 33ce5f83..205d8b7a 100644
--- a/modules/digibug/views/admin_digibug.html.php
+++ b/modules/digibug/views/admin_digibug.html.php
@@ -1,16 +1,13 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $("#gDigibugTabs").ready(function() {
-    $("#gDigibugTabs").tabs({
-      event: "mouseover"
-    });
+    $("#gDigibugTabs").tabs({});
   });
 </script>
 <div id="gAdminDigibug">
-  <h2><?= t("Digibug Adminstration") ?>  </h2>
   <div class="gAdminDigibugIntro">
     <p>
-      <?= t("Digibug offers you two options for turning your photos into a wide variety of prints, gifts and games. Choose your solution and get started today!") ?>
+      <?= t("offers you two options for turning your photos into a wide variety of prints, gifts and games. Choose your solution and get started today!") ?>
     </p>
   </div>
   <div id="gDigibugTabs">
@@ -19,20 +16,8 @@
       <li><a href="#gDigibugTabAdvanced"><?= t("Advanced") ?></a></li>
     </ul>
     <div id="gDigibugTabBasic" class="gDigibugTab">
-      <div class="gDigibugTitle">
-        <?= t("Digibug Basic") ?>
-        <br/>
-        <?= t("Fast Easy Photo Fulfillment") ?>
-      </div>
       <div class="gDigibugText">
-        <?= t("Power up your Gallery with professional level fulfillment from Kodak. Just use Digibug Basic and there's nothing else to do - no registration, no administration, no hassles.") ?>
-      </div>
-      <div class="gDigibugListItems">
-        <ul>
-          <li><?= t("Matte and Glossy prints, from 4x6 to as big as 30x40") ?></li>
-          <li><?= t("Great photo gifts like canvases, apparel, bags, puzzles, mugs and sports memorabilia and more") ?></li>
-          <li><?= t("Outstanding quality and customer service") ?></li>
-        </ul>
+        <?= t("Use Digibug Basic and there's nothing else to do - no registration, no administration.") ?>
       </div>
       <div class="gDigibugRounded ui-corner-all">
         <br/>
@@ -45,16 +30,8 @@
       </div>
     </div>
     <div id="gDigibugTabAdvanced" class="gDigibugTab">
-      <div class="gDigibugTitle">
-        <?= t("Digibug ADVANCED") ?>
-        <br/>
-        <?= t("The Pro\'s Solution") ?>
-      </div>
       <div class="gDigibugText">
-        <?= t("Digibug ADVANCED allows you to set your own price for photos and gifts. Simply provide us with your account information and we'll send you a check each month with your profits. It's the perfect online retail business solution for a photographer - no inventory, no overhead... just profits!") ?>
-      </div>
-      <div class="gDigibugText">
-        <?= t("Enjoy the same range of professional level photo prints and gifts, but set your own price and charge what you believe your photos are worth. We'll take care of the rest.") ?>
+        <?= t("Digibug Advanced allows you to set your own price for photos and gifts. Simply provide your account information.") ?>
       </div>
       <div style="width: 120px;" class="gDigibugText gDigibugSignIn">
         <?= t("New to Digibug ADVANCED?") ?>
@@ -62,7 +39,7 @@
         <a href="http://www.digibug.com/signup.php" style=""><?= t("Sign up") ?></a><?= t(" to get started") ?>
       </div>
       <div class="gDigibugAdvancedForm">
-        <div class="gDigibugText"><?= t("Do you have a Digibug Company ID and Event ID?") ?></div>
+        <div class="gDigibugText"><?= t("Enter your Digibug company ID and event ID") ?></div>
         <?= $form ?>
       </div>
     </div>
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 862f1fc1..1653f115 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -9,6 +9,8 @@
  * 4) Content blocks in specific layout containers
  * 5) Browser hacks
  * 6) jQuery and jQuery UI
+ * 7) Server Add
+ * 8) Digibug Print Administration
  */
 
 /** *******************************************************************
@@ -436,3 +438,94 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   width: 150px;
   overflow: hidden;
 }
+
+/** *******************************************************************
+ * 8) Digibug Print Administration
+ **********************************************************************/
+.gAdminDigibugIntro {
+  background-image: url(../images/digibug_logo.png);
+  background-repeat: no-repeat;
+  padding-bottom: 20px;
+  width: 820px;
+}
+
+.gAdminDigibugIntro p {
+  font-family: Trebuchet MS,Arial,Verdana,Helvetica,sans-serif;
+  font-size: 1.3em;
+  font-weight: bold;
+  padding-left: 5px;
+  padding-top: 15px;
+  text-indent: 110px;
+}
+
+.gDigibugTab {
+  width: 820px;
+  height: 420px;
+}
+
+.gDigibugTab .gDigibugTitle {
+  font-family: Georgia;
+  font-size: 20px;
+  font-weight: bold;
+  padding-bottom: 10px;
+}
+
+.gDigibugTab .gDigibugText {
+  font-size: 12px;
+  font-weight: bold;
+  line-height: 17px;
+  padding-bottom: 15px;
+}
+
+.gDigibugListItems ul {
+  list-style-type: disc;
+  padding-left: 20px;
+  font-size: 12px;
+  font-weight: bold;
+  line-height: 15px;
+}
+
+.gDigibugListItems ul li{
+  padding-top: 10px;
+}
+
+.gDigibugRounded {
+  background-color:#5C9CCC;
+  color: white;
+  width: 308px;
+  height: 45px;
+  text-align: center;
+  line-height: 15px;
+  margin-top: 10px;
+  font-weight: bold;
+  font-size: 12px;
+  margin-left: 60px;
+  margin-right: -50px;
+  margin-left: 20px;
+  margin-right: 0px;
+}
+
+.gDigibugRounded a {
+  color: white !important;
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+.gDigibugSignIn {
+  width: 115px;
+  float: left;
+}
+
+.gDigibugSignIn a {
+  color: black;
+  font-size: 16px;
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+.gDigibugAdvancedForm {
+  float: left;
+  padding-left: 30px;
+  width: 180px;
+}
+
diff --git a/modules/digibug/css/logo.png b/themes/admin_default/images/digibug_logo.png
similarity index 100%
rename from modules/digibug/css/logo.png
rename to themes/admin_default/images/digibug_logo.png
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index c7918fc0..671b259d 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -4,15 +4,16 @@
  * @requires YUI reset, font, grids CSS
  *
  * Sheet organization:
- * 1)  Basic HTML elements
- * 2)  Reusable classes
- * 3)  Reusable content blocks
- * 4)  Page layout containers
- * 5)  Content blocks in specific layout containers
- * 6)  Navigation and menus
- * 7)  Browser hacks
- * 8)  jQuery and jQuery UI
- * 9)  Right-to-left language styles
+ *  1)  Basic HTML elements
+ *  2)  Reusable classes
+ *  3)  Reusable content blocks
+ *  4)  Page layout containers
+ *  5)  Content blocks in specific layout containers
+ *  6)  Navigation and menus
+ *  7)  Browser hacks
+ *  8)  jQuery and jQuery UI
+ *  9)  Right-to-left language styles
+ * 10)  Digibug Print
  */
 
 /** *******************************************************************
@@ -1049,4 +1050,8 @@ form .gError,
 .rtl .gButtonSet li,
 .rtl .ui-icon-left .ui-icon {
   float: right;
-}
\ No newline at end of file
+}
+
+/** *******************************************************************
+ * 10)  Digibug Print
+ **********************************************************************/