diff --git a/admin/catalog.php b/admin/catalog.php
index bc67c13f..472ee8ce 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -236,11 +236,11 @@ switch ($_REQUEST['action']) {
 			// Run our initial add
 			$catalog->run_add($_POST);
 
-			show_box_top(T_('Catalog Created'), 'box box_catalog_created');
+			UI::show_box_top(T_('Catalog Created'), 'box box_catalog_created');
 			echo "<h2>" .  T_('Catalog Created') . "</h2>";
 			Error::display('general');
 			Error::display('catalog_add');
-			show_box_bottom();
+			UI::show_box_bottom();
 
 			show_confirmation('','', Config::get('web_path').'/admin/catalog.php');
 
diff --git a/admin/modules.php b/admin/modules.php
index bf55578b..33ec00e6 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -138,15 +138,15 @@ switch ($_REQUEST['action']) {
 	break;
 	case 'show_plugins':
 		$plugins = Plugin::get_plugins();
-		show_box_top(T_('Plugins'), 'box box_localplay_plugins');
+		UI::show_box_top(T_('Plugins'), 'box box_localplay_plugins');
 		require_once Config::get('prefix') . '/templates/show_plugins.inc.php';
-		show_box_bottom();
+		UI::show_box_bottom();
 	break;
 	case 'show_localplay':
 		$controllers = Localplay::get_controllers();
-		show_box_top(T_('Localplay Controllers'), 'box box_localplay_controllers');
+		UI::show_box_top(T_('Localplay Controllers'), 'box box_localplay_controllers');
 		require_once Config::get('prefix') . '/templates/show_localplay_controllers.inc.php';
-		show_box_bottom();
+		UI::show_box_bottom();
 	break;
 	default:
 		// Rien a faire
diff --git a/browse.php b/browse.php
index b4fcf559..b503bac9 100644
--- a/browse.php
+++ b/browse.php
@@ -70,12 +70,12 @@ switch($_REQUEST['action']) {
 		$object_ids = $browse->get_saved();
 		$keys = array_keys($object_ids);
 		Tag::build_cache($keys);
-		show_box_top(T_('Tag Cloud'), 'box box_tag_cloud');
+		UI::show_box_top(T_('Tag Cloud'), 'box box_tag_cloud');
 		$browse2 = new Browse();
 		$browse2->set_type('song');
 		$browse2->store();
 		require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php';
-		show_box_bottom();
+		UI::show_box_bottom();
 		require_once Config::get('prefix') . '/templates/browse_content.inc.php';
 	break;
 	case 'artist':
diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php
index 074efacd..ce22728e 100644
--- a/lib/class/browse.class.php
+++ b/lib/class/browse.class.php
@@ -127,86 +127,86 @@ class Browse extends Query {
 		// Switch on the type of browsing we're doing
 		switch ($type) {
 			case 'song':
-				show_box_top(T_('Songs') . $match, $class);
+				UI::show_box_top(T_('Songs') . $match, $class);
 				Song::build_cache($object_ids);
 				require_once Config::get('prefix') . '/templates/show_songs.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'album':
-				show_box_top(T_('Albums') . $match, $class);
+				UI::show_box_top(T_('Albums') . $match, $class);
 				Album::build_cache($object_ids,'extra');
 				require_once Config::get('prefix') . '/templates/show_albums.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'user':
-				show_box_top(T_('Manage Users') . $match, $class);
+				UI::show_box_top(T_('Manage Users') . $match, $class);
 				require_once Config::get('prefix') . '/templates/show_users.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'artist':
-				show_box_top(T_('Artists') . $match, $class);
+				UI::show_box_top(T_('Artists') . $match, $class);
 				Artist::build_cache($object_ids,'extra');
 				require_once Config::get('prefix') . '/templates/show_artists.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'live_stream':
 				require_once Config::get('prefix') . '/templates/show_live_stream.inc.php';
-				show_box_top(T_('Radio Stations') . $match, $class);
+				UI::show_box_top(T_('Radio Stations') . $match, $class);
 				require_once Config::get('prefix') . '/templates/show_live_streams.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'playlist':
 				Playlist::build_cache($object_ids);
-				show_box_top(T_('Playlists') . $match, $class);
+				UI::show_box_top(T_('Playlists') . $match, $class);
 				require_once Config::get('prefix') . '/templates/show_playlists.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'playlist_song':
-				show_box_top(T_('Playlist Songs') . $match,$class);
+				UI::show_box_top(T_('Playlist Songs') . $match,$class);
 				require_once Config::get('prefix') . '/templates/show_playlist_songs.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'playlist_localplay':
-				show_box_top(T_('Current Playlist'));
+				UI::show_box_top(T_('Current Playlist'));
 				require_once Config::get('prefix') . '/templates/show_localplay_playlist.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'smartplaylist':
-				show_box_top(T_('Smart Playlists') . $match, $class);
+				UI::show_box_top(T_('Smart Playlists') . $match, $class);
 				require_once Config::get('prefix') . '/templates/show_smartplaylists.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'catalog':
-				show_box_top(T_('Catalogs'), $class);
+				UI::show_box_top(T_('Catalogs'), $class);
 				require_once Config::get('prefix') . '/templates/show_catalogs.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'shoutbox':
-				show_box_top(T_('Shoutbox Records'),$class);
+				UI::show_box_top(T_('Shoutbox Records'),$class);
 				require_once Config::get('prefix') . '/templates/show_manage_shoutbox.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'flagged':
-				show_box_top(T_('Flagged Records'),$class);
+				UI::show_box_top(T_('Flagged Records'),$class);
 				require_once Config::get('prefix') . '/templates/show_flagged.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'tag':
 				Tag::build_cache($tags);
-				show_box_top(T_('Tag Cloud'),$class);
+				UI::show_box_top(T_('Tag Cloud'),$class);
 				require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'video':
 				Video::build_cache($object_ids);
-				show_box_top(T_('Videos'),$class);
+				UI::show_box_top(T_('Videos'),$class);
 				require_once Config::get('prefix') . '/templates/show_videos.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			break;
 			case 'democratic':
-				show_box_top(T_('Democratic Playlist'),$class);
+				UI::show_box_top(T_('Democratic Playlist'),$class);
 				require_once Config::get('prefix') . '/templates/show_democratic_playlist.inc.php';
-				show_box_bottom();
+				UI::show_box_bottom();
 			default:
 				// Rien a faire
 			break;
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 029c2d67..f0c773b2 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -277,9 +277,9 @@ class Catalog extends database_object {
 	public function run_add($options) {
 
 		if ($this->catalog_type == 'remote') {
-			show_box_top(T_('Running Remote Sync') . '. . .');
+			UI::show_box_top(T_('Running Remote Sync') . '. . .');
 			$this->get_remote_catalog($type=0);
-			show_box_bottom();
+			UI::show_box_bottom();
 			return true;
 		}
 
@@ -1079,9 +1079,9 @@ class Catalog extends database_object {
 	public function add_to_catalog() {
 
 		if ($this->catalog_type == 'remote') {
-			show_box_top(T_('Running Remote Update') . '. . .');
+			UI::show_box_top(T_('Running Remote Update') . '. . .');
 			$this->get_remote_catalog($type=0);
-			show_box_bottom();
+			UI::show_box_bottom();
 			return true;
 		}
 
@@ -1127,12 +1127,12 @@ class Catalog extends database_object {
 		$time_diff = ($current_time - $start_time) ?: 0;
 		$rate = intval($this->count / $time_diff) ?: T_('N/A');
 
-		show_box_top();
+		UI::show_box_top();
 		echo "\n<br />" . 
 		printf(T_('Catalog Update Finished.  Total Time: [%s] Total Songs: [%s] Songs Per Second: [%s]'),
 			date('i:s', $time_diff), $this->count, $rate);
 		echo '<br /><br />';
-		show_box_bottom();
+		UI::show_box_bottom();
 
 	} // add_to_catalog
 
@@ -1277,11 +1277,11 @@ class Catalog extends database_object {
 		// Remove any orphaned artists/albums/etc.
 		self::gc();
 
-		show_box_top();
+		UI::show_box_top();
 		echo "<strong>";
 		printf (T_ngettext('Catalog Clean Done. %d file removed.', 'Catalog Clean Done. %d files removed.', $dead_total), $dead_total);
 		echo "</strong><br />\n";
-		show_box_bottom();
+		UI::show_box_bottom();
 		ob_flush();
 		flush();
 
@@ -1381,11 +1381,11 @@ class Catalog extends database_object {
 		self::gc();
 		$this->update_last_update();
 
-		show_box_top();
+		UI::show_box_top();
 		echo '<strong>';
 		printf(T_('Catalog Verify Done. %d of %d files updated.'), $total_updated, $number);
 		echo "</strong><br />\n";
-		show_box_bottom();
+		UI::show_box_bottom();
 		ob_flush();
 		flush();
 
diff --git a/lib/class/ui.class.php b/lib/class/ui.class.php
index c4fd3d47..021ad67d 100644
--- a/lib/class/ui.class.php
+++ b/lib/class/ui.class.php
@@ -109,6 +109,24 @@ class UI {
 		}
 	}
 
+	/**
+	 * show_box_top
+	 *
+	 * This shows the top of the box.
+	 */
+	public static function show_box_top($title = '', $class = '') {
+		require Config::get('prefix') . '/templates/show_box_top.inc.php';
+	}
+
+	/**
+	 * show_box_bottom
+	 *
+	 * This shows the bottom of the box
+	 */
+	public static function show_box_bottom() {
+		require Config::get('prefix') . '/templates/show_box_bottom.inc.php';
+	}
+
 	/**
 	 * truncate
 	 *
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 00f7eb27..577e9ce1 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -342,28 +342,6 @@ function show_playlist_select($name,$selected='',$style='') {
 
 } // show_playlist_select
 
-/**
- * show_box_top
- * This function requires the top part of the box
- * it takes title as an optional argument
- */
-function show_box_top($title='',$class='') {
-
-	require Config::get('prefix') . '/templates/show_box_top.inc.php';
-
-} // show_box_top
-
-/**
- * show_box_bottom
- * This function requires the bottom part of the box
- * it does not take any arguments
- */
-function show_box_bottom() {
-
-	require Config::get('prefix') . '/templates/show_box_bottom.inc.php';
-
-} // show_box_bottom
-
 /**
  * get_user_icon
  * this function takes a name and a returns either a text representation
diff --git a/templates/header.inc.php b/templates/header.inc.php
index f6d5a8ad..a1deb402 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -66,11 +66,11 @@ if (is_rtl(Config::get('lang'))
 		  </a>
 		</h1>
 		<div id="headerbox">
-			<?php show_box_top('','box box_headerbox'); ?>
+			<?php UI::show_box_top('','box box_headerbox'); ?>
 			<?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?>
 			<?php require_once Config::get('prefix') . '/templates/show_playtype_switch.inc.php'; ?>
 			<span id="loginInfo"><a href="<?php echo Config::get('web_path'); ?>/preferences.php?tab=account"><?php echo $GLOBALS['user']->fullname; ?></a> <a href="<?php echo Config::get('web_path'); ?>/logout.php">[<?php echo T_('Log out'); ?>]</a></span>
-			<?php show_box_bottom(); ?>
+			<?php UI::show_box_bottom(); ?>
 		</div> <!-- End headerbox -->
 	</div><!-- End header -->
 	<div id="sidebar"><!-- This is the sidebar -->
diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php
index 7ccbb4a1..8d502694 100644
--- a/templates/show_access_list.inc.php
+++ b/templates/show_access_list.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Access Control'), 'box box_access_control'); ?>
+<?php UI::show_box_top(T_('Access Control'), 'box box_access_control'); ?>
 <div id="information_actions" class="left-column">
 <ul>
 	<li>
@@ -41,8 +41,8 @@
 
 </ul>
 </div>
-<?php show_box_bottom(); ?>
-<?php show_box_top(T_('Access Control Entries'), 'box box_access_entries'); ?>
+<?php UI::show_box_bottom(); ?>
+<?php UI::show_box_top(T_('Access Control Entries'), 'box box_access_entries'); ?>
 <?php Ajax::start_container('browse_content'); ?>
 <?php if (count($list)) { ?>
 <table cellspacing="1" cellpadding="3" class="tabledata">
@@ -77,4 +77,4 @@
 </table>
 <?php  } // end if count ?>
 <?php Ajax::end_container(); ?>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php
index 8e0998be..9e030ccc 100644
--- a/templates/show_add_access.inc.php
+++ b/templates/show_add_access.inc.php
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 ?>
-<?php show_box_top(T_('Add Access Control List'), 'box box_add_access'); ?>
+<?php UI::show_box_top(T_('Add Access Control List'), 'box box_add_access'); ?>
 <?php Error::display('general'); ?>
 <form name="update_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host">
 <table class="tabledata" cellpadding="5" cellspacing="0">
@@ -105,4 +105,4 @@
 		<input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php
index 39689cc6..7a3049f7 100644
--- a/templates/show_add_catalog.inc.php
+++ b/templates/show_add_catalog.inc.php
@@ -23,7 +23,7 @@
 $default_rename = "%a - %T - %t";
 $default_sort = "%a/%A";
 ?>
-<?php show_box_top(T_('Add a Catalog'), 'box box_add_catalog'); ?>
+<?php UI::show_box_top(T_('Add a Catalog'), 'box box_add_catalog'); ?>
 <p><?php echo T_("In the form below enter either a local path (i.e. /data/music) or the URL to a remote Ampache installation (i.e http://theotherampache.com)"); ?></p>
 <?php Error::display('general'); ?>
 <form name="update_catalog" method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
@@ -89,4 +89,4 @@ $default_sort = "%a/%A";
   <input class="button" type="submit" value="<?php echo T_('Add Catalog'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_add_live_stream.inc.php b/templates/show_add_live_stream.inc.php
index 1f680b8f..ef7402ed 100644
--- a/templates/show_add_live_stream.inc.php
+++ b/templates/show_add_live_stream.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Add Radio Station'), 'box box_add_live_stream'); ?>
+<?php UI::show_box_top(T_('Add Radio Station'), 'box box_add_live_stream'); ?>
 <form name="radio" method="post" action="<?php echo Config::get('web_path'); ?>/radio.php?action=create">
 <table>
 <tr>
@@ -68,4 +68,4 @@
 	<input class="button" type="submit" value="<?php echo T_('Add'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_add_playlist.inc.php b/templates/show_add_playlist.inc.php
index 4e994603..2a1239b4 100644
--- a/templates/show_add_playlist.inc.php
+++ b/templates/show_add_playlist.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Create a new playlist')); ?>
+<?php UI::show_box_top(T_('Create a new playlist')); ?>
 <form name="songs" method="post" action="<?php echo Config::get('web_path'); ?>/playlist.php">
 <table>
 <tr>
@@ -42,4 +42,4 @@
 	<input type="hidden" name="action" value="Create" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php
index 0a1fbd47..739b1571 100644
--- a/templates/show_add_shout.inc.php
+++ b/templates/show_add_shout.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Post to Shoutbox'), 'box box_add_shout'); ?>
+<?php UI::show_box_top(T_('Post to Shoutbox'), 'box box_add_shout'); ?>
 <form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/shout.php?action=add_shout">
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <tr>
@@ -44,4 +44,4 @@
 </tr>
 </table>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php
index 8d6a2c93..d42988cd 100644
--- a/templates/show_add_user.inc.php
+++ b/templates/show_add_user.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Adding a New User'), 'box box_add_user'); ?>
+<?php UI::show_box_top(T_('Adding a New User'), 'box box_add_user'); ?>
 <?php Error::display('general'); ?>
 <form name="add_user" enctype="multpart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php?action=add_user"; ?>">
 <table class="tabledata" cellspacing="0" cellpadding="0">
@@ -85,4 +85,4 @@
 	<input type="submit" value="<?php echo T_('Add User'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_adds_catalog.inc.php b/templates/show_adds_catalog.inc.php
index 04ed4971..a1ddf4d9 100644
--- a/templates/show_adds_catalog.inc.php
+++ b/templates/show_adds_catalog.inc.php
@@ -20,11 +20,11 @@
  *
  */
 
-show_box_top(T_('Starting New Song Search'), 'box box_adds_catalog');
+UI::show_box_top(T_('Starting New Song Search'), 'box box_adds_catalog');
 /* HINT: Catalog Name */
 printf(T_('Starting New Song Search on %s catalog'), "<strong>[ $this->name ]</strong>");
 echo "<br />\n";
 echo T_('Found') . ': <span id="add_count_' . $this->id . '">' . T_('None') . '</span><br />';
 echo T_('Reading') . ':<span id="add_dir_' . $this->id . '"></span><br />';
-show_box_bottom();
+UI::show_box_bottom();
 ?>
diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php
index 9e5f4bfa..70189bb4 100644
--- a/templates/show_admin_info.inc.php
+++ b/templates/show_admin_info.inc.php
@@ -29,14 +29,14 @@ $flagged	= Flag::get_recent(10);
 $songs = Song::get_disabled(10);
 ?>
 
-<?php show_box_top(T_('Last Ten Flagged Records')); ?>
+<?php UI::show_box_top(T_('Last Ten Flagged Records')); ?>
 	<?php require Config::get('prefix') . '/templates/show_flagged.inc.php'; ?>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 
-<?php show_box_top(T_('Disabled Songs')); ?>
+<?php UI::show_box_top(T_('Disabled Songs')); ?>
 	<!-- Show Last 10 Disabled Songs -->&nbsp;
 	<?php require Config::get('prefix') . '/templates/show_disabled_songs.inc.php'; ?>
 	<div>
 	<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo T_('Show All'); ?>...</a>
 	</div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php
index bfe92113..0df0be23 100644
--- a/templates/show_admin_tools.inc.php
+++ b/templates/show_admin_tools.inc.php
@@ -24,7 +24,7 @@ $web_path 	= Config::get('web_path');
 $catalogs 	= Catalog::get_catalogs();
 
 ?>
-<?php show_box_top(T_('Catalogs')); ?>
+<?php UI::show_box_top(T_('Catalogs')); ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
   <col id="col_name" />
@@ -84,9 +84,9 @@ $catalogs 	= Catalog::get_catalogs();
 <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_clear_stats"><?php echo T_('Clear Catalog Stats'); ?></a>
 <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo T_('Gather Album Art'); ?></a>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 
-<?php show_box_top(T_('Other Tools')); ?>
+<?php UI::show_box_top(T_('Other Tools')); ?>
 <div>
 	<a class="button" href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo T_('Show Duplicate Songs'); ?></a>
 	<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo T_('Clear Now Playing'); ?></a>
@@ -96,4 +96,4 @@ $catalogs 	= Catalog::get_catalogs();
 	<a class="button" href="<?php echo $web_path; ?>/admin/users.php?action=show_inactive&amp;days=30"><?php echo T_('Show Inactive Users'); ?></a>
 <!--	<a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo T_('Check for New Version'); ?></a>-->
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index 90734128..ce83c232 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -29,7 +29,7 @@ if ($album->disk) {
 }
 $title .= '&nbsp;-&nbsp;' . $album->f_artist_link;
 ?>
-<?php show_box_top($title,'info-box'); ?>
+<?php UI::show_box_top($title,'info-box'); ?>
 <div class="album_art">
 	<?php
 	if ($album->name != T_('Unknown (Orphaned)')) {
@@ -80,7 +80,7 @@ $title .= '&nbsp;-&nbsp;' . $album->f_artist_link;
 	<?php } ?>
 </ul>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 <div id="additional_information">
 &nbsp;
 </div>
diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php
index cc173090..838bf5fb 100644
--- a/templates/show_album_art.inc.php
+++ b/templates/show_album_art.inc.php
@@ -25,7 +25,7 @@ $total_images = count($images);
 $rows = floor($total_images/4);
 $i = 0;
 ?>
-<?php show_box_top(T_('Select New Album Art'), 'box box_album_art'); ?>
+<?php UI::show_box_top(T_('Select New Album Art'), 'box box_album_art'); ?>
 <table class="table-data">
 <tr>
 <?php
@@ -60,4 +60,4 @@ while ($i <= $rows) {
 } // end while
 ?>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php
index edfd7701..59cb1566 100644
--- a/templates/show_artist.inc.php
+++ b/templates/show_artist.inc.php
@@ -25,7 +25,7 @@ $web_path = Config::get('web_path');
 <?php
 $browse = new Browse();
 $browse->set_type($object_type);
-show_box_top($artist->f_name, 'info-box');
+UI::show_box_top($artist->f_name, 'info-box');
 if (Config::get('ratings')) {
 ?>
 <div id="rating_<?php echo intval($artist->id); ?>_artist" style="display:inline;">
@@ -73,7 +73,7 @@ if (Config::get('ratings')) {
         <?php echo Ajax::observe('show_artist_artCB', 'click', Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id,'')); ?>
 </ul>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 <?php
 	$browse->show_objects($object_ids);
 	$browse->store();
diff --git a/templates/show_clean_catalog.inc.php b/templates/show_clean_catalog.inc.php
index 137631c5..f3f26464 100644
--- a/templates/show_clean_catalog.inc.php
+++ b/templates/show_clean_catalog.inc.php
@@ -20,11 +20,11 @@
  *
  */
 
-show_box_top();
+UI::show_box_top();
 /* HINT: Catalog Name */
 printf(T_('Cleaning the %s Catalog'), "<strong>[ $this->name ]</strong>");
 echo "...<br />";
 echo T_('Checking') . ': <span id="clean_count_' . $this->id . '"></span><br />';
 echo T_('Reading') . ':<span id="clean_dir_' . $this->id . '"></span><br />';
-show_box_bottom();
+UI::show_box_bottom();
 ?>
diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php
index 09be1d5c..b8b5dd23 100644
--- a/templates/show_confirmation.inc.php
+++ b/templates/show_confirmation.inc.php
@@ -22,7 +22,7 @@
 
 $confirmation = Core::form_register($form_name);
 ?>
-<?php show_box_top(scrub_out($title), 'box box_confirmation'); ?>
+<?php UI::show_box_top(scrub_out($title), 'box box_confirmation'); ?>
 <?php echo $text; ?>
 <br />
 	<form method="post" action="<?php echo $path; ?>" style="display:inline;">
@@ -35,4 +35,4 @@ $confirmation = Core::form_register($form_name);
 	<?php echo $confirmation; ?>
 	</form>
 <?php } ?>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php
index 680d66be..ec829416 100644
--- a/templates/show_create_democratic.inc.php
+++ b/templates/show_create_democratic.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-show_box_top(T_('Configure Democratic Playlist')); ?>
+UI::show_box_top(T_('Configure Democratic Playlist')); ?>
 <form method="post" action="<?php echo Config::get('web_path'); ?>/democratic.php?action=create" enctype="multipart/form-data">
 <table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
@@ -61,4 +61,4 @@ show_box_top(T_('Configure Democratic Playlist')); ?>
 		<input type="submit" value="<?php echo T_('Update'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php
index d5fb8cd0..adfcea5c 100644
--- a/templates/show_debug.inc.php
+++ b/templates/show_debug.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Debug Tools'), 'box box_debug_tools'); ?>
+<?php UI::show_box_top(T_('Debug Tools'), 'box box_debug_tools'); ?>
 <div id="information_actions">
 <ul>
 <li>
@@ -33,8 +33,8 @@
 </li>
 </ul>
 </div>
-<?php show_box_bottom(); ?>
-<?php show_box_top(T_('PHP Settings'), 'box box_php_settings'); ?>
+<?php UI::show_box_bottom(); ?>
+<?php UI::show_box_top(T_('PHP Settings'), 'box box_php_settings'); ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
 	<col id="col_php_setting">
@@ -81,9 +81,9 @@
 	<td><?php echo print_bool(function_exists('bindtextdomain')); ?></td>
 </tr>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 
-<?php show_box_top(T_('Current Configuration'), 'box box_current_configuration'); ?>
+<?php UI::show_box_top(T_('Current Configuration'), 'box box_current_configuration'); ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
    <col id="col_configuration">
@@ -112,4 +112,4 @@
 </tr>
 <?php } ?>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php
index e31ae2db..5479f3b2 100644
--- a/templates/show_democratic.inc.php
+++ b/templates/show_democratic.inc.php
@@ -21,7 +21,7 @@
  */
 
 $string = $democratic->is_enabled() ? sprintf(T_('%s Playlist') ,$democratic->name) : T_('Democratic Playlist');
-show_box_top($string , 'info-box');
+UI::show_box_top($string , 'info-box');
 ?>
 <div id="information_actions">
 <ul>
@@ -49,4 +49,4 @@ show_box_top($string , 'info-box');
 </ul>
 
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_duplicate.inc.php b/templates/show_duplicate.inc.php
index 0af31886..bc5435f2 100644
--- a/templates/show_duplicate.inc.php
+++ b/templates/show_duplicate.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Find Duplicates'), 'box box_duplicate'); ?>
+<?php UI::show_box_top(T_('Find Duplicates'), 'box box_duplicate'); ?>
 <form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/duplicates.php?action=find_duplicates" method="post" enctype="multipart/form-data" >
 <table cellspacing="0" cellpadding="3">
 <tr>
@@ -42,4 +42,4 @@
       <input type="submit" value="<?php echo T_('Find Duplicates'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php
index bc46fced..6a62e19c 100644
--- a/templates/show_duplicates.inc.php
+++ b/templates/show_duplicates.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Duplicate Songs')); ?>
+<?php UI::show_box_top(T_('Duplicate Songs')); ?>
 <form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/flag.php?action=disable">
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
@@ -84,4 +84,4 @@
 </tr>
 </table>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_dynamic.inc.php b/templates/show_dynamic.inc.php
index 1b16cfd9..67173b97 100644
--- a/templates/show_dynamic.inc.php
+++ b/templates/show_dynamic.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Advanced Random Rules')); ?>
+<?php UI::show_box_top(T_('Advanced Random Rules')); ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
 	<col id="col_field" />
@@ -85,4 +85,4 @@
 	</td>
 </tr>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php
index 5cf78839..88cdae60 100644
--- a/templates/show_edit_access.inc.php
+++ b/templates/show_edit_access.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Edit Access Control List')); ?>
+<?php UI::show_box_top(T_('Edit Access Control List')); ?>
 <form name="edit_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=update_record&access_id=<?php echo intval($access->id); ?>">
 <table class="table-data">
 <tr>
@@ -79,4 +79,4 @@
 	<input type="submit" value="<?php echo T_('Update'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php
index 47906b7d..6895bd1f 100644
--- a/templates/show_edit_album.inc.php
+++ b/templates/show_edit_album.inc.php
@@ -21,7 +21,7 @@
  */
 ?>
 
-<?php show_box_top(T_('Edit Album')); ?>
+<?php UI::show_box_top(T_('Edit Album')); ?>
 <form name="edit_album" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_album">
 <table class="tabledata">
 <tr class="<?php echo UI::flip_class(); ?>">
@@ -48,4 +48,4 @@
 		<input type="submit" value="<?php echo T_('Update Album'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php
index 9c84c465..14bb89fe 100644
--- a/templates/show_edit_artist.inc.php
+++ b/templates/show_edit_artist.inc.php
@@ -21,7 +21,7 @@
  */
 ?>
 
-<?php show_box_top(T_('Edit Artist')); ?>
+<?php UI::show_box_top(T_('Edit Artist')); ?>
 <form name="edit_artist" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_artist">
 <table class="tabledata">
 <tr class="<?php echo UI::flip_class(); ?>">
@@ -42,4 +42,4 @@
 		<input type="submit" value="<?php echo T_('Update Artist'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php
index 01ea612e..c7d5752e 100644
--- a/templates/show_edit_catalog.inc.php
+++ b/templates/show_edit_catalog.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalog->path . ')'), 'box box_edit_catalog');
+UI::show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalog->path . ')'), 'box box_edit_catalog');
 ?>
 <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
 <table cellspacing="0" cellpadding="0">
@@ -71,4 +71,4 @@ show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalog->p
 	<input class="button" type="submit" value="<?php echo T_('Save Catalog Settings'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_edit_shout.inc.php b/templates/show_edit_shout.inc.php
index a820ada6..c20fee9b 100644
--- a/templates/show_edit_shout.inc.php
+++ b/templates/show_edit_shout.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Edit existing Shoutbox Post')); ?>
+<?php UI::show_box_top(T_('Edit existing Shoutbox Post')); ?>
 <form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/shout.php?action=edit_shout">
 <input type="hidden" name="shout_id" value="<?php echo $shout->id; ?>" />
 <table class="tabledata" cellpadding="0" cellspacing="0">
@@ -43,4 +43,4 @@
 </tr>
 </table>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php
index 11129915..95c427cc 100644
--- a/templates/show_edit_song.inc.php
+++ b/templates/show_edit_song.inc.php
@@ -21,7 +21,7 @@
  */
 ?>
 
-<?php show_box_top(T_('Edit Song')); ?>
+<?php UI::show_box_top(T_('Edit Song')); ?>
 <form name="edit_song" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php">
 <table>
 <tr class="<?php echo UI::flip_class(); ?>">
@@ -81,4 +81,4 @@
 		<input type="submit" value="<?php echo T_('Update Song'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php
index 9ebd2e1f..76dfb198 100644
--- a/templates/show_edit_user.inc.php
+++ b/templates/show_edit_user.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Editing existing User')); ?>
+<?php UI::show_box_top(T_('Editing existing User')); ?>
 <?php Error::display('general'); ?>
 <form name="update_user" enctype="multipart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php"; ?>">
 <table class="tabledata" cellspacing="0" cellpadding="0">
@@ -117,4 +117,4 @@
 		<input type="hidden" name="user_id" value="<?php echo $client->id; ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_export.inc.php b/templates/show_export.inc.php
index 39c250c6..96151492 100644
--- a/templates/show_export.inc.php
+++ b/templates/show_export.inc.php
@@ -25,7 +25,7 @@ ${$name} = ' selected="selected"';
 $name = 'catalog_' . $_REQUEST['export_catalog'];
 ${$name} = ' selected="selected"';
 
-show_box_top(T_('Export Catalog'), 'box box_export'); ?>
+UI::show_box_top(T_('Export Catalog'), 'box box_export'); ?>
 <form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/export.php?action=export" method="post" enctype="multipart/form-data" >
 <table class="tableform" cellspacing="0" cellpadding="3">
 <tr>
@@ -61,4 +61,4 @@ show_box_top(T_('Export Catalog'), 'box box_export'); ?>
       <input type="submit" value="<?php echo T_('Export'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_gather_art.inc.php b/templates/show_gather_art.inc.php
index 9c793df6..9f17c90e 100644
--- a/templates/show_gather_art.inc.php
+++ b/templates/show_gather_art.inc.php
@@ -20,9 +20,9 @@
  *
  */
 
-show_box_top(T_('Album Art Search'), 'box box_gather_art');
+UI::show_box_top(T_('Album Art Search'), 'box box_gather_art');
 echo "<strong>" . T_('Starting Album Art Search') . ". . .</strong><br />\n";
 echo T_('Searched') . ": <span id=\"count_art_" . $catalog_id . "\">" . T_('None') . "</span><br />";
 echo T_('Reading') . ":<span id=\"read_art_$catalog_id\"></span><br />";
-show_box_bottom();
+UI::show_box_bottom();
 ?>
diff --git a/templates/show_get_albumart.inc.php b/templates/show_get_albumart.inc.php
index 4a1b1991..0995e740 100644
--- a/templates/show_get_albumart.inc.php
+++ b/templates/show_get_albumart.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Customize Search'), 'box box_get_albumart'); ?>
+<?php UI::show_box_top(T_('Customize Search'), 'box box_get_albumart'); ?>
 <form enctype="multipart/form-data" name="coverart" method="post" action="<?php echo Config::get('web_path'); ?>/albums.php?action=find_art&amp;album_id=<?php echo $album->id; ?>&amp;artist_name=<?php echo urlencode($_REQUEST['artist_name']);?>&amp;album_name=<?php echo urlencode($_REQUEST['album_name']); ?>&amp;cover=<?php echo urlencode($_REQUEST['cover']); ?>" style="Display:inline;">
 <table>
 <tr>
@@ -63,4 +63,4 @@
 		<input type="submit" value="<?php echo T_('Get Art'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php
index 41bc80cb..a767d41a 100644
--- a/templates/show_import_playlist.inc.php
+++ b/templates/show_import_playlist.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Importing a Playlist from a File'), 'box box_import_playlist'); ?>
+<?php UI::show_box_top(T_('Importing a Playlist from a File'), 'box box_import_playlist'); ?>
 <form method="post" name="import_playlist" action="<?php echo Config::get('web_path'); ?>/playlist.php" enctype="multipart/form-data">
 <table cellpadding="0" cellspacing="0">
 <tr>
@@ -46,5 +46,5 @@
 		<input type="submit" value="<?php echo T_('Import Playlist'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 
diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php
index 0eba867b..7c12cbf4 100644
--- a/templates/show_index.inc.php
+++ b/templates/show_index.inc.php
@@ -29,7 +29,7 @@ if (Art::is_enabled()) {
 	echo Ajax::observe('window','load',Ajax::action('?page=index&action=random_albums','random_albums'));
 ?>
 <div id="random_selection">
-	<?php show_box_top(T_('Albums of the Moment')); echo T_('Loading...'); show_box_bottom(); ?>
+	<?php UI::show_box_top(T_('Albums of the Moment')); echo T_('Loading...'); UI::show_box_bottom(); ?>
 </div>
 <?php } ?>
 <!-- Recently Played -->
diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php
index 651f56d6..863d07c2 100644
--- a/templates/show_ip_history.inc.php
+++ b/templates/show_ip_history.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php /* HINT: Username */ show_box_top(sprintf(T_('%s IP History'), $working_user->fullname)); ?>
+<?php /* HINT: Username */ UI::show_box_top(sprintf(T_('%s IP History'), $working_user->fullname)); ?>
 <div id="information_actions">
 <ul>
 <li>
@@ -61,4 +61,4 @@
 </tr>
 
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_live_stream.inc.php b/templates/show_live_stream.inc.php
index 29e768e9..ce2613f6 100644
--- a/templates/show_live_stream.inc.php
+++ b/templates/show_live_stream.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Manage Radio Stations'),'info-box'); ?>
+<?php UI::show_box_top(T_('Manage Radio Stations'),'info-box'); ?>
 <div id="information_actions">
 <ul>
 <li>
@@ -28,4 +28,4 @@
 </li>
 </ul>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php
index f7a410b2..ec92c41f 100644
--- a/templates/show_localplay_add_instance.inc.php
+++ b/templates/show_localplay_add_instance.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Add Localplay Instance'), 'box box_localplay_add_instance'); ?>
+<?php UI::show_box_top(T_('Add Localplay Instance'), 'box box_localplay_add_instance'); ?>
 <form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=add_instance">
 <table cellpadding="3" cellspacing="0" class="tabledata">
 <?php foreach ($fields as $key=>$field) { ?>
@@ -34,4 +34,4 @@
 		<input type="submit" value="<?php echo T_('Add Instance'); ?>" />
   </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_localplay_edit_instance.inc.php b/templates/show_localplay_edit_instance.inc.php
index 59806aa3..9d9484ce 100644
--- a/templates/show_localplay_edit_instance.inc.php
+++ b/templates/show_localplay_edit_instance.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Edit Localplay Instance'), 'box box_localplay_edit_instance'); ?>
+<?php UI::show_box_top(T_('Edit Localplay Instance'), 'box box_localplay_edit_instance'); ?>
 <form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=update_instance&amp;instance=<?php echo intval($_REQUEST['instance']); ?>">
 <table cellpadding="3" cellspacing="0" class="tabledata">
 <?php foreach ($fields as $key=>$field) { ?>
@@ -34,4 +34,4 @@
 		<input type="submit" value="<?php echo T_('Update Instance'); ?>" />
   </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_localplay_instances.inc.php b/templates/show_localplay_instances.inc.php
index 59db9d5c..094a581f 100644
--- a/templates/show_localplay_instances.inc.php
+++ b/templates/show_localplay_instances.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Show Localplay Instances'), 'box box_localplay_instances'); ?>
+<?php UI::show_box_top(T_('Show Localplay Instances'), 'box box_localplay_instances'); ?>
 <table cellpadding="3" cellspacing="0" class="tabledata">
 <tr>
 	<?php foreach ($fields as $key=>$field) { ?>
@@ -42,4 +42,4 @@
 </tr>
 <?php } ?>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php
index d96250e1..87f25283 100644
--- a/templates/show_localplay_status.inc.php
+++ b/templates/show_localplay_status.inc.php
@@ -24,7 +24,7 @@ $status = $localplay->status();
 $now_playing = $status['track_title'] ? $status['track_title'] . ' - ' . $status['track_album'] . ' - ' . $status['track_artist'] : '';
 ?>
 <?php Ajax::start_container('localplay_status'); ?>
-<?php show_box_top(T_('Localplay Control') . ' - '. strtoupper($localplay->type), 'box box_localplay_status'); ?>
+<?php UI::show_box_top(T_('Localplay Control') . ' - '. strtoupper($localplay->type), 'box box_localplay_status'); ?>
 <?php echo T_('Now Playing'); ?>:<i><?php echo $now_playing; ?></i>
 <div id="information_actions">
 <ul>
@@ -49,5 +49,5 @@ $now_playing = $status['track_title'] ? $status['track_title'] . ' - ' . $status
 </li>
 </ul>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 <?php Ajax::end_container(); ?>
diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php
index 3ec408f6..a972fc34 100644
--- a/templates/show_login_form.inc.php
+++ b/templates/show_login_form.inc.php
@@ -89,9 +89,9 @@ if (@is_readable(Config::get('prefix') . '/config/motd.php')) {
 	</div>
 	<div id="motd">
 	<?php
-        show_box_top(T_('Message of the Day'));
+        UI::show_box_top(T_('Message of the Day'));
         require_once Config::get('prefix') . '/config/motd.php';
-        show_box_bottom();
+        UI::show_box_bottom();
 	?>
 <?php
 }
diff --git a/templates/show_lyrics.inc.php b/templates/show_lyrics.inc.php
index 9407675c..7c6573db 100644
--- a/templates/show_lyrics.inc.php
+++ b/templates/show_lyrics.inc.php
@@ -31,7 +31,7 @@
  * @todo get lyrics from id3tag, if possible.
 */
 /* HINT: Song Title */
-show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics');
+UI::show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics');
 ?>
 <table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
@@ -48,4 +48,4 @@ show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics');
 	</td>
 </tr>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_lyrics_song.inc.php b/templates/show_lyrics_song.inc.php
index 677f1517..eb99a1cf 100644
--- a/templates/show_lyrics_song.inc.php
+++ b/templates/show_lyrics_song.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-show_box_top($song->title , 'box box_lyrics_song');
+UI::show_box_top($song->title , 'box box_lyrics_song');
 
 /* Prepare the variables */
 $title = scrub_out(UI::truncate($song->title));
@@ -63,4 +63,4 @@ $artist = scrub_out(UI::truncate($song->f_artist_full));
 </div>
 
 
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_mail_users.inc.php b/templates/show_mail_users.inc.php
index 4ce04ea8..91af8eb0 100644
--- a/templates/show_mail_users.inc.php
+++ b/templates/show_mail_users.inc.php
@@ -21,7 +21,7 @@
  */
 ?>
 
-<?php show_box_top(T_('Send E-mail to Users'), 'box box_mail_users'); ?>
+<?php UI::show_box_top(T_('Send E-mail to Users'), 'box box_mail_users'); ?>
 <form name="mail" method="post" action="<?php echo Config::get('web_path'); ?>/admin/mail.php?action=send_mail" enctype="multipart/form-data">
 <table>
   <tr>
@@ -122,5 +122,5 @@
         <input class="button" type="submit" value="<?php echo T_('Send Mail'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 
diff --git a/templates/show_manage_catalogs.inc.php b/templates/show_manage_catalogs.inc.php
index 20ef4458..c26d0778 100644
--- a/templates/show_manage_catalogs.inc.php
+++ b/templates/show_manage_catalogs.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Show Catalogs'), 'box box_manage_catalogs') ?>
+<?php UI::show_box_top(T_('Show Catalogs'), 'box box_manage_catalogs') ?>
 <div id="information_actions">
 <table>
 <tr>
@@ -46,7 +46,7 @@
 </tr>
 </table>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 <?php
 		$catalog_ids = Catalog::get_catalogs();
 		$browse = new Browse();
diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php
index 57cd75f2..8dc9b1d5 100644
--- a/templates/show_manage_democratic.inc.php
+++ b/templates/show_manage_democratic.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-show_box_top(T_('Manage Democratic Playlists'));  ?>
+UI::show_box_top(T_('Manage Democratic Playlists'));  ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
 	<col id="col_number" />
@@ -69,4 +69,4 @@ show_box_top(T_('Manage Democratic Playlists'));  ?>
 <div>
 <a class="button" href="<?php echo Config::get('web_path'); ?>/democratic.php?action=show_create"><?php echo T_('Create New Playlist'); ?></a>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_newest.inc.php b/templates/show_newest.inc.php
index 96a1540e..8a28bb12 100644
--- a/templates/show_newest.inc.php
+++ b/templates/show_newest.inc.php
@@ -20,6 +20,6 @@
  *
  */
 ?>
-<?php show_box_top(T_('Information')); ?>
+<?php UI::show_box_top(T_('Information')); ?>
 <?php require_once Config::get('prefix') . '/templates/show_stats_newest.inc.php'; ?>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php
index 6b3c985b..c56aea60 100644
--- a/templates/show_now_playing.inc.php
+++ b/templates/show_now_playing.inc.php
@@ -30,7 +30,7 @@
 if (count($results)) {
 $link = Config::get('use_rss') ? ' ' . Ampache_RSS::get_display('nowplaying') : '';
 ?>
-<?php show_box_top(T_('Now Playing') . $link); ?>
+<?php UI::show_box_top(T_('Now Playing') . $link); ?>
 <?php
 foreach ($results as $item) {
 	$media = $item['media'];
@@ -47,5 +47,5 @@ foreach ($results as $item) {
 <?php
 } // end foreach
 ?>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 <?php } // end if count results ?>
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 5580f76e..1b552d60 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -31,7 +31,7 @@ ob_start();
 require Config::get('prefix') . '/templates/show_playlist_title.inc.php';
 $title = ob_get_contents();
 ob_end_clean();
-show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . 
+UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . 
 	'</div>', 'info-box');
 ?>
 <div id="information_actions">
@@ -68,7 +68,7 @@ show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title .
 	<?php } ?>
 </ul>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 <?php
 	$browse = new Browse();
 	$browse->set_type('playlist_song');
diff --git a/templates/show_popular.inc.php b/templates/show_popular.inc.php
index 2b5bf262..e6c0b3b7 100644
--- a/templates/show_popular.inc.php
+++ b/templates/show_popular.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-show_box_top(T_('Information'));
+UI::show_box_top(T_('Information'));
 
 $object_ids = Stats::get_top('song');
 $browse = new Browse();
@@ -40,5 +40,5 @@ $browse->set_type('artist');
 $browse->show_objects($object_ids);
 $browse->store();
 
-show_box_bottom();
+UI::show_box_bottom();
 ?>
diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php
index 3d984e6c..69e72bef 100644
--- a/templates/show_preference_admin.inc.php
+++ b/templates/show_preference_admin.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-show_box_top(T_('Preference Administration'));
+UI::show_box_top(T_('Preference Administration'));
 ?>
 <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/preferences.php" enctype="multipart/form-data">
 <table class="tabledata" cellpadding="0" cellspacing="0">
@@ -57,4 +57,4 @@ show_box_top(T_('Preference Administration'));
 		<input type="submit" value="<?php echo T_('Update'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php
index 7ece8439..4e9cc556 100644
--- a/templates/show_preferences.inc.php
+++ b/templates/show_preferences.inc.php
@@ -26,7 +26,7 @@
  */
 
 ?>
-<?php /* HINT: Username */ show_box_top(sprintf(T_('Editing %s preferences'), $fullname),'box box_preferences'); ?>
+<?php /* HINT: Username */ UI::show_box_top(sprintf(T_('Editing %s preferences'), $fullname),'box box_preferences'); ?>
 <?php  if ($_REQUEST['tab'] != 'account' && $_REQUEST['tab'] != 'modules') { ?>
 
 <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=update_preferences" enctype="multipart/form-data">
@@ -49,4 +49,4 @@ if ($_REQUEST['tab'] == 'account') {
 ?>
 </form>
 
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index fb5eddab..58abec32 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Play Random Selection'), 'box box_random'); ?>
+<?php UI::show_box_top(T_('Play Random Selection'), 'box box_random'); ?>
 <form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php?action=get_advanced&type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>">
 <table class="tabledata" cellpadding="3" cellspacing="0">
 <tr id="search_location">
@@ -103,7 +103,7 @@
         <input type="submit" value="<?php echo T_('Enqueue'); ?>" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 <div id="browse">
 <?php
 	if (is_array($object_ids)) {
diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php
index 818c40a4..08a9ae52 100644
--- a/templates/show_random_albums.inc.php
+++ b/templates/show_random_albums.inc.php
@@ -23,7 +23,7 @@
 $web_path = Config::get('web_path');
 $button = Ajax::button('?page=index&action=random_albums','random', T_('Refresh'),'random_refresh');
 ?>
-<?php show_box_top(T_('Albums of the Moment') . ' ' . $button, 'box box_random_albums'); ?>
+<?php UI::show_box_top(T_('Albums of the Moment') . ' ' . $button, 'box box_random_albums'); ?>
 
 	<?php
 	if ($albums) {
@@ -53,4 +53,4 @@ $button = Ajax::button('?page=index&action=random_albums','random', T_('Refresh'
         	<?php } // end foreach ?>
 	<?php } // end if albums ?>
 
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php
index 2aecf9e7..da8fb6d7 100644
--- a/templates/show_recently_played.inc.php
+++ b/templates/show_recently_played.inc.php
@@ -21,7 +21,7 @@
  */
 
 $link = Config::get('use_rss') ? ' ' . Ampache_RSS::get_display('recently_played') :  '';
-show_box_top(T_('Recently Played') . $link, 'box box_recently_played');
+UI::show_box_top(T_('Recently Played') . $link, 'box box_recently_played');
 ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
@@ -111,4 +111,4 @@ show_box_top(T_('Recently Played') . $link, 'box box_recently_played');
 	<th class="cel_lastplayed"><?php echo T_('Last Played'); ?></th>
 </tr>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_recommended_artists.inc.php b/templates/show_recommended_artists.inc.php
index f4b6fa50..c48e394f 100644
--- a/templates/show_recommended_artists.inc.php
+++ b/templates/show_recommended_artists.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Similar Artists'), 'info-box'); ?>
+<?php UI::show_box_top(T_('Similar Artists'), 'info-box'); ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
   <col id="col_add" />
diff --git a/templates/show_rename_artist.inc.php b/templates/show_rename_artist.inc.php
index 74ef6485..1c0d16dc 100644
--- a/templates/show_rename_artist.inc.php
+++ b/templates/show_rename_artist.inc.php
@@ -26,7 +26,7 @@ function insert()
 	document.getElementById('artist_name').value = '<?php echo $artist->name; ?>';
 }
 </script>
-<?php /* HINT: Artist Name */ show_box_top(sprintf(T_('Rename %s'), $artist->name)); ?>
+<?php /* HINT: Artist Name */ UI::show_box_top(sprintf(T_('Rename %s'), $artist->name)); ?>
 <form name="rename_artist" method="post" action="<?php echo Config::get('web_path'); ?>/artists.php?action=rename&amp;artist=<?php echo $artist->id; ?>" style="Display:inline;">
         <?php show_artist_pulldown($artist->id, "artist_id", 4); ?>
 	<br />
@@ -37,4 +37,4 @@ function insert()
 	<input type="checkbox" name="update_id3" value="yes" />&nbsp; <?php echo T_('Update id3 tags') ?><br />
 	<input type="submit" value="<?php echo T_('Rename'); ?>" /><br />
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_rules.inc.php b/templates/show_rules.inc.php
index 0bd5b97c..29554514 100644
--- a/templates/show_rules.inc.php
+++ b/templates/show_rules.inc.php
@@ -31,7 +31,7 @@ $logic_operator = strtolower($logic_operator);
 <script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search.js"></script>
 <script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search-data.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>"></script>
 
-<?php show_box_top(T_('Rules') . "...", 'box box_rules'); ?>
+<?php UI::show_box_top(T_('Rules') . "...", 'box box_rules'); ?>
 <table class="tabledata" cellpadding="3" cellspacing="0">
 <tbody id="searchtable">
 	<tr id="rules_operator">
@@ -54,7 +54,7 @@ $logic_operator = strtolower($logic_operator);
 	</tr>
 </tbody>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 
 <?php
 if ($playlist) {
diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php
index 52e6899e..636d5eb8 100644
--- a/templates/show_search.inc.php
+++ b/templates/show_search.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-show_box_top(T_('Search Ampache') . "...", 'box box_advanced_search');
+UI::show_box_top(T_('Search Ampache') . "...", 'box box_advanced_search');
 ?>
 <form id="search" name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>" enctype="multipart/form-data" style="Display:inline">
 <table class="tabledata" cellpadding="3" cellspacing="0">
@@ -57,4 +57,4 @@ show_box_top(T_('Search Ampache') . "...", 'box box_advanced_search');
 	        <input type="hidden" id="hiddenaction" name="action" value="search" />
 </div>
 </form>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_search_options.inc.php b/templates/show_search_options.inc.php
index b1d7e3e3..f8ae35d1 100644
--- a/templates/show_search_options.inc.php
+++ b/templates/show_search_options.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Options'),'info-box'); ?>
+<?php UI::show_box_top(T_('Options'),'info-box'); ?>
 <div id="information_actions">
 <ul>
 <li>
@@ -35,4 +35,4 @@
 	<?php } ?>
 </ul>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_shoutbox.inc.php b/templates/show_shoutbox.inc.php
index 38925390..55d25e85 100644
--- a/templates/show_shoutbox.inc.php
+++ b/templates/show_shoutbox.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(T_('Shoutbox')); ?>
+<?php UI::show_box_top(T_('Shoutbox')); ?>
 <div id="shoutbox">
 <?php
   foreach ($shouts as $shout_id) {
@@ -39,4 +39,4 @@
 </div>
 <?php } ?>
 </div>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_smartplaylist.inc.php b/templates/show_smartplaylist.inc.php
index 7853309b..c72734c9 100644
--- a/templates/show_smartplaylist.inc.php
+++ b/templates/show_smartplaylist.inc.php
@@ -25,7 +25,7 @@ ob_start();
 require Config::get('prefix') . '/templates/show_smartplaylist_title.inc.php';
 $title = ob_get_contents();
 ob_end_clean();
-show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title .
+UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title .
         '</div>' , 'box box_smartplaylist');
 ?>
 <div id="information_actions">
@@ -65,4 +65,4 @@ show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title .
 
 </form>
 
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_song.inc.php b/templates/show_song.inc.php
index 7fd41c75..527862c5 100644
--- a/templates/show_song.inc.php
+++ b/templates/show_song.inc.php
@@ -23,7 +23,7 @@
 $icon = $song->enabled ? 'disable' : 'enable';
 $button_flip_state_id = 'button_flip_state_' . $song->id;
 ?>
-<?php show_box_top($song->title . ' ' . T_('Details'), 'box box_song_details'); ?>
+<?php UI::show_box_top($song->title . ' ' . T_('Details'), 'box box_song_details'); ?>
 <dl class="song_details">
 <?php if (Config::get('ratings')) { ?>
 <dt class="<?php echo UI::flip_class(); ?>"><?php echo T_('Rating'); ?></dt>
@@ -71,4 +71,4 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
   }
 ?>
 </dl>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_stats.inc.php b/templates/show_stats.inc.php
index d21716bb..61f62409 100644
--- a/templates/show_stats.inc.php
+++ b/templates/show_stats.inc.php
@@ -23,7 +23,7 @@
 $stats = Catalog::get_stats();
 $catalogs = Catalog::get_catalogs();
 ?>
-<?php show_box_top(T_('Statistics'), 'box box_stats'); ?>
+<?php UI::show_box_top(T_('Statistics'), 'box box_stats'); ?>
 <em><?php echo T_('Catalogs'); ?></em>
 <table class="tabledata" cellpadding="3" cellspacing="1">
 <tr class="th-top">
@@ -89,4 +89,4 @@ $catalogs = Catalog::get_catalogs();
 <?php } ?>
 
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_stats_popular.inc.php b/templates/show_stats_popular.inc.php
index e6fa99f4..79a9be85 100644
--- a/templates/show_stats_popular.inc.php
+++ b/templates/show_stats_popular.inc.php
@@ -24,15 +24,15 @@
 <?php
                 $objects = Stats::get_top('album');
                 $headers = array('f_link' => T_('Most Popular Albums'));
-                show_box_top('','info-box box_popular_albums');
+                UI::show_box_top('','info-box box_popular_albums');
                 require Config::get('prefix') . '/templates/show_objects.inc.php';
-                show_box_bottom();
+                UI::show_box_bottom();
 
                 $objects = Stats::get_top('artist');
                 $headers = array('f_name_link' => T_('Most Popular Artists'));
-                show_box_top('','info-box box_popular_artists');
+                UI::show_box_top('','info-box box_popular_artists');
                 require Config::get('prefix') . '/templates/show_objects.inc.php';
-                show_box_bottom();
+                UI::show_box_bottom();
 
 ?>
 </div>
diff --git a/templates/show_update_items.inc.php b/templates/show_update_items.inc.php
index 9956a284..e482c1d2 100644
--- a/templates/show_update_items.inc.php
+++ b/templates/show_update_items.inc.php
@@ -20,10 +20,10 @@
  *
  */
 
-show_box_top(T_('Starting Update from Tags'), 'box box_update_items');
+UI::show_box_top(T_('Starting Update from Tags'), 'box box_update_items');
 Catalog::update_single_item($type,$object_id);
 ?>
 <br />
 <strong><?php echo T_('Update from Tags Complete'); ?></strong>&nbsp;&nbsp;
 <a class="button" href="<?php echo $target_url; ?>"><?php echo T_('Continue'); ?></a>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php
index c1f39905..e62b1810 100644
--- a/templates/show_user.inc.php
+++ b/templates/show_user.inc.php
@@ -24,7 +24,7 @@ $last_seen      = $client->last_seen ? date("m\/d\/y - H:i",$client->last_seen)
 $create_date    = $client->create_date ? date("m\/d\/y - H:i",$client->create_date) : T_('Unknown');
 $client->format();
 ?>
-<?php show_box_top($client->fullname); ?>
+<?php UI::show_box_top($client->fullname); ?>
 <table cellspacing="0">
 <tr>
 	<td valign="top">
@@ -56,7 +56,7 @@ $client->format();
 	</td>
 </tr>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
 <?php
 	$data = Song::get_recently_played($client->id);
 	require Config::get('prefix') . '/templates/show_recently_played.inc.php';
diff --git a/templates/show_user_preferences.inc.php b/templates/show_user_preferences.inc.php
index b87b3f01..9bb5448f 100644
--- a/templates/show_user_preferences.inc.php
+++ b/templates/show_user_preferences.inc.php
@@ -26,7 +26,7 @@
  */
 
 ?>
-<?php /* HINT: Editing Username preferences */ show_box_top(sprintf(T_('Editing %s preferences'), $client->fullname),'box box_preferences'); ?>
+<?php /* HINT: Editing Username preferences */ UI::show_box_top(sprintf(T_('Editing %s preferences'), $client->fullname),'box box_preferences'); ?>
 <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=admin_update_preferences" enctype="multipart/form-data">
 <table class="tabledata" cellspacing="0">
 <colgroup>
@@ -58,4 +58,4 @@
 </table>
 </form>
 
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_user_recommendations.inc.php b/templates/show_user_recommendations.inc.php
index 5d2cac26..a979b9be 100644
--- a/templates/show_user_recommendations.inc.php
+++ b/templates/show_user_recommendations.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(sprintf('%s Recommendations'), $working_user->fullname); ?>
+<?php UI::show_box_top(sprintf('%s Recommendations'), $working_user->fullname); ?>
 <table class="tabledata">
 <tr>
 	<td valign="top">
@@ -58,4 +58,4 @@
 	</td>
 </tr>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_user_stats.inc.php b/templates/show_user_stats.inc.php
index 58a14cc0..8909fcc2 100644
--- a/templates/show_user_stats.inc.php
+++ b/templates/show_user_stats.inc.php
@@ -20,7 +20,7 @@
  *
  */
 ?>
-<?php show_box_top(sprintf('%s Favorites'), $working_user->fullname); ?>
+<?php UI::show_box_top(sprintf('%s Favorites'), $working_user->fullname); ?>
 <table class="tabledata">
 <tr>
 	<td valign="top">
@@ -64,4 +64,4 @@
 	</td>
 </tr>
 </table>
-<?php show_box_bottom(); ?>
+<?php UI::show_box_bottom(); ?>
diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php
index a3ae6189..b913a4cf 100644
--- a/templates/show_verify_catalog.inc.php
+++ b/templates/show_verify_catalog.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-show_box_top(T_('Verify Catalog'), 'box box_verify_catalog');
+UI::show_box_top(T_('Verify Catalog'), 'box box_verify_catalog');
 /* HINT: Catalog Name */
 printf(T_('Updating the %s catalog'), "<strong>[ $this->name ]</strong>");
 echo "<br />\n";
@@ -28,5 +28,5 @@ printf(T_ngettext('%d item found checking tag information', '%d items found chec
 echo "<br />\n\n";
 echo T_('Verified') . ': <span id="verify_count_' . $this->id . '">' . $catalog_verify_found . '</span><br />';
 echo T_('Reading') . ': <span id="verify_dir_' . $this->id . '">' . $catalog_verify_directory . '</span><br />';
-show_box_bottom();
+UI::show_box_bottom();
 ?>