diff --git a/plugins/mobile_unl/views/mobile/pageshells/pageshell.php b/plugins/mobile_unl/views/mobile/pageshells/pageshell.php
index 3e4158ddea1ac6e4fa666a001c207766e3b75e35..82a06ab40680618757f8db8a79f171bca795d9dc 100755
--- a/plugins/mobile_unl/views/mobile/pageshells/pageshell.php
+++ b/plugins/mobile_unl/views/mobile/pageshells/pageshell.php
@@ -1,45 +1,70 @@
 <?php
-header('Content-type: text/html; charset=UTF-8');
-require_once 'UNL/Templates.php';
+/**
+ * Elgg Mobile
+ * A Mobile Client For Elgg
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Mark Harding
+ * @link http://maestrozone.com
+ *
+ */
 
-UNL_Templates::$options['version'] = 3;
-$page = UNL_Templates::factory('Popup');
+// Set the content type
+//header("Content-type: text/html; charset=UTF-8");
 
-$page->maincontentarea = '';
 
-$page->navlinks = '<ul><li><a href="http://planetred.unl.edu/">Home</a></li><li><a href="http://planetred.unl.edu/account/register.php">Register</a></li></ul>';
-$page->breadcrumbs = "<!-- WDN: see glossary item \'breadcrumbs\' --> <ul> <li class=\"first\"><a href=\"http://www.unl.edu/\">UNL</a></li>  <li>Planet Red</li> </ul>";
-$page->doctitle = '<title>UNL | Planet Red | '.$vars['title'].'</title>';
-//$page->head .= "<!--begin-->".elgg_view('page_elements/header', $vars)."<!--END-->";
+ini_set('display_errors', true);
+error_reporting(E_ALL);
 
-$page->head .= '<link rel="stylesheet" href="' . $vars['url'] .'_css/css.css?lastcache='.$vars['config']->lastcache.'>&amp;viewtype=mobile&view=mobile" type="text/css" />';
 
 
-$headerstuff = <<<END
-<meta name="apple-mobile-web-app-capable" content="yes" />
-<meta name="viewport" content="width = 320" />
+// Set title
+if (empty($vars['title'])) {
+	$title = $vars['config']->sitename;
+} else if (empty($vars['config']->sitename)) {
+	$title = $vars['title'];
+} else {
+	$title = $vars['config']->sitename . ": " . $vars['title'];
+}
 
-<link rel="apple-touch-icon" href="http://www.unl.edu/ucomm/templatedependents/templatecss/images/apple-touch-icon.png" />
-<link media="only screen and (max-device-width: 480px)" href="mobile.css" type="text/css" rel="stylesheet" />
-<link media="screen" href="http://m.unl.edu/mobile.css" type="text/css" rel="stylesheet" />
-<script type="text/javascript" src="http://m.unl.edu/mobile.js"></script>
-<style type="text/css">#footer { display: block; }</style>
-END;
 
-$page->head .= $headerstuff;
 
+/* begin UNL template stuff */
 
+require_once 'UNL/Templates.php';
 
-$page->maincontentarea .= elgg_view('page_elements/unl_nav', $vars);
+UNL_Templates::$options['version'] = 3;
+$page = UNL_Templates::factory('Popup');
+$page->doctitle = '<title>'.$vars['title'].'</title>';
 $page->titlegraphic = '<h1><a href="'.$vars['config']->url.'" title="Planet Red Home">'.$vars['config']->sitename.'</a></h1>';
+$page->head .= <<<END
+<script type="text/javascript" src="http://m.unl.edu/mobile.js"></script>
+<link media="only screen and (max-device-width: 480px)" href="http://m.unl.edu/mobile.css" type="text/css" rel="stylesheet" />
+<link media="screen" href="http://m.unl.edu/mobile.css" type="text/css" rel="stylesheet" />
+END;
 
-$page->maincontentarea .= elgg_view('messages/list', array('object' => $vars['sysmessages']));
-$page->maincontentarea .= $vars['body'];
+$page->maincontentarea = <<<END
+<ul id="mobile_breadcrumbs">
+	<li class="parent_site"><a href="http://m.unl.edu/?view=proxy&amp;u=http://www.unl.edu/" title="UNL Home">UNL</a></li>
+	<li class="current_site"><a href="#mobile_navigation">Planet Red</a></li>
+</ul>
+END;
+
+$page->maincontentarea .= elgg_view('page_elements/header_contents', $vars);
 
+$page->maincontentarea .= '<div id="layout_canvas">' . elgg_view('messages/list', array('object' => $vars['sysmessages'])) . $vars['body'];
 
-$page->contactinfo = '<h3>Contacting Us</h3><p><strong>University of Nebraska-Lincoln</strong><br/>1400 R Street<br/>Lincoln, NE 68588<br/>402-472-7211</p>';
+$page->maincontentarea .= <<<END
+<div class="clearfloat"></div>
+</div><!-- /#layout_canvas -->
+<div class="mobilecopy">
+Planet Red Mobile &copy; 2010 University of Nebraska&ndash;Lincoln
+</div><!-- /.mobile_copy -->
+<!-- footer -->
+END;
 
-$page->footercontent = elgg_view('page_elements/footer', $vars);
+//$page->footercontent = elgg_view('page_elements/footer', $vars);
 
 echo $page;
 ?>
\ No newline at end of file