diff --git a/classes/lnApp/Site.php b/classes/lnApp/Site.php
index b328e22..745e41d 100644
--- a/classes/lnApp/Site.php
+++ b/classes/lnApp/Site.php
@@ -29,7 +29,7 @@ abstract class lnApp_Site {
 	 * @note We need this function here, since we call self:: methods, which need to resolve to the child class.
 	 */
 	public static function Datetime($date) {
-		return sprintf('%s %s',self::Date($date),self::Time($date));
+		return $date ? sprintf('%s %s',self::Date($date),self::Time($date)) : NULL;
 	}
 
 	/**
diff --git a/views/theme/bootstrap/page.php b/views/theme/bootstrap/page.php
index 18b2b48..35123ec 100644
--- a/views/theme/bootstrap/page.php
+++ b/views/theme/bootstrap/page.php
@@ -34,7 +34,7 @@
 		<div class="navbar navbar-inverse navbar-fixed-top">
 			<div class="navbar-inner">
 				<div class="container">
-					<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-cog"></i> </a>
+					<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><i class="glyphicon glyphicon-cog"></i> </a>
 					<a class="brand" href="<?php echo URL::site(); ?>"><?php echo Site::Appname(); ?><sup></sup></a>
 				</div> <!-- /container -->
 			</div> <!-- /navbar-inner -->