diff --git a/themes/3nids_theme/3nids/css/fix-ie.css b/themes/3nids_theme/3nids/css/fix-ie.css
index be6e22be..aa27547a 100755
--- a/themes/3nids_theme/3nids/css/fix-ie.css
+++ b/themes/3nids_theme/3nids/css/fix-ie.css
@@ -2,7 +2,7 @@
  * Fix display in IE 6, 7
  */
 
-.g-clearfix {
+.ui-helper-clearfix {
   zoom: 1;
 }
 
diff --git a/themes/3nids_theme/3nids/js/ui.init.js b/themes/3nids_theme/3nids/js/ui.init.js
index ca892485..14dc5f2a 100755
--- a/themes/3nids_theme/3nids/js/ui.init.js
+++ b/themes/3nids_theme/3nids/js/ui.init.js
@@ -17,6 +17,10 @@ $(document).ready(function() {
   });
   $("#g-site-menu").css("display", "block");
 
+  // Initialize short forms
+  $(".g-short-form").gallery_short_form();
+
+
   // Initialize status message effects
   $("#g-action-status li").gallery_show_message();
 
@@ -30,20 +34,6 @@ $(document).ready(function() {
     $("#g-view-menu a").addClass("ui-icon");
   }
 
-  // Initialize short forms
-  var short_forms = new Array(
-    "#g-quick-search-form",
-    "#g-add-tag-form",
-    "#g-search-form"
-  );
-
-  for (var i in short_forms) {
-    short_form_init(short_forms[i]);
-    $(short_forms[i]).addClass("g-short-form");
-  }
-  $(".g-short-form input[type=text]").addClass("ui-corner-left");
-  $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
-
   // Apply jQuery UI button css to submit inputs
   $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
 
diff --git a/themes/3nids_theme/3nids/views/album.html.php b/themes/3nids_theme/3nids/views/album.html.php
index b4d2e603..98310b49 100755
--- a/themes/3nids_theme/3nids/views/album.html.php
+++ b/themes/3nids_theme/3nids/views/album.html.php
@@ -11,7 +11,7 @@
 	$children_offset = ($theme->pagination->current_page -1) * $page_size ; ?>
 
 
-<ul id="g-album-grid" class="g-clearfix">
+<ul id="g-album-grid" class="ui-helper-clearfix">
 <? if (count($children)): ?>
 <? for($i=0;$i<$children_offset;$i++): ?>
 	  <? $child = $children_all[$i] ?>
diff --git a/themes/3nids_theme/3nids/views/page.html.php b/themes/3nids_theme/3nids/views/page.html.php
index 51a680c8..d16baa74 100755
--- a/themes/3nids_theme/3nids/views/page.html.php
+++ b/themes/3nids_theme/3nids/views/page.html.php
@@ -58,7 +58,6 @@
     </script>
     <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
-    <?= $theme->script("gallery.form.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
     <?= $theme->script("jquery.localscroll.js") ?>
      <?= $theme->script("jquery.easing.js") ?>
@@ -80,7 +79,7 @@
     <?= $theme->page_top() ?>
     <div id="doc4" class="yui-t5 g-view">
       <?= $theme->site_status() ?>
-      <div id="g-header" class="g-clearfix">
+      <div id="g-header" class="ui-helper-clearfix">
         <div id="g-banner">
           <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
diff --git a/themes/3nids_theme/3nids/views/pager.html.php b/themes/3nids_theme/3nids/views/pager.html.php
index 325644dd..f2e6812b 100755
--- a/themes/3nids_theme/3nids/views/pager.html.php
+++ b/themes/3nids_theme/3nids/views/pager.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-pager g-clearfix">
+<ul class="g-pager ui-helper-clearfix">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("%current_page / %total_pages",
                        "%current_page / %total_pages",
diff --git a/themes/3nids_theme/3nids/views/sidebar.html.php b/themes/3nids_theme/3nids/views/sidebar.html.php
index c49a7b51..afa148c9 100755
--- a/themes/3nids_theme/3nids/views/sidebar.html.php
+++ b/themes/3nids_theme/3nids/views/sidebar.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->sidebar_top() ?>
 <div class="g-toolbar">
-  <div id="g-view-menu" class="g-buttonset g-clearfix">
+  <div id="g-view-menu" class="g-buttonset ui-helper-clearfix">
     <? if ($page_type == "album"):?>
       <?= $theme->album_menu() ?>
     <? elseif ($page_type == "photo") : ?>