diff --git a/codepot/src/codepot/controllers/project.php b/codepot/src/codepot/controllers/project.php
index fd94d7bf..b8d59fb1 100644
--- a/codepot/src/codepot/controllers/project.php
+++ b/codepot/src/codepot/controllers/project.php
@@ -470,7 +470,7 @@ class Project extends Controller
 		}
 	}
 
-	function catalog_json ($filter = '', $offset = '')
+	function enjson_catalog ($filter = '', $offset = '')
 	{
 		$this->load->model ('ProjectModel', 'projects');
 	
@@ -557,7 +557,7 @@ class Project extends Controller
 		print codepot_json_encode ($result);
 	}
 
-	function quickfind_json ($needle = '')
+	function enjson_quickfind ($needle = '')
 	{
 		// this function is to serve the intermediate search
 		// by the quick project finder in the task bar.
diff --git a/codepot/src/codepot/models/subversionmodel.php b/codepot/src/codepot/models/subversionmodel.php
index aaae6ade..c211b82d 100644
--- a/codepot/src/codepot/models/subversionmodel.php
+++ b/codepot/src/codepot/models/subversionmodel.php
@@ -288,7 +288,11 @@ class SubversionModel extends Model
 				$fileinfo['created_rev'] = $info[0]['last_changed_rev'];
 			else
 				$fileinfo['created_rev'] = $info[0]['revision'];
-			$fileinfo['last_author'] = $info[0]['last_changed_author'];
+
+			if (array_key_exists('last_changed_author', $info[0]))
+				$fileinfo['last_author'] = $info[0]['last_changed_author'];
+			else
+				$fileinfo['last_author'] = '';
 
 			$actual_rev = $fileinfo['created_rev'];
 		}
diff --git a/codepot/src/codepot/views/code_blame.php b/codepot/src/codepot/views/code_blame.php
index 31de5e1f..7570507f 100644
--- a/codepot/src/codepot/views/code_blame.php
+++ b/codepot/src/codepot/views/code_blame.php
@@ -341,15 +341,16 @@ if (array_key_exists('properties', $file) && count($file['properties']) > 0)
 
 </div> <!-- code_blame_mainarea -->
 
-<!---------------------------------------------------------------------------->
+<div class='footer-pusher'></div> <!-- for sticky footer -->
 
+</div> <!--  code_blame_content -->
+
+<!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  code_blame_content -->
-
 </body>
 
 </html>
diff --git a/codepot/src/codepot/views/code_diff.php b/codepot/src/codepot/views/code_diff.php
index 53b0da93..7d51ceab 100644
--- a/codepot/src/codepot/views/code_diff.php
+++ b/codepot/src/codepot/views/code_diff.php
@@ -606,15 +606,16 @@ else
 
 </div> <!-- code_diff_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- code_diff_content -->
 
 <!---------------------------------------------------------------------------->
 
-
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div> <!-- code_diff_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php
index 44503099..eafdcfa0 100644
--- a/codepot/src/codepot/views/code_file.php
+++ b/codepot/src/codepot/views/code_file.php
@@ -336,6 +336,9 @@ if (array_key_exists('properties', $file) && count($file['properties']) > 0)
 
 </div> <!-- code_file_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!--  code_file_content -->
 
 <!---------------------------------------------------------------------------->
 
@@ -343,7 +346,6 @@ if (array_key_exists('properties', $file) && count($file['properties']) > 0)
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  code_file_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php
index 2d72e956..0901ca64 100644
--- a/codepot/src/codepot/views/code_folder.php
+++ b/codepot/src/codepot/views/code_folder.php
@@ -664,14 +664,16 @@ $this->load->view (
 
 </div> <!-- code_folder_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!--  code_folder_content -->
+
 <!-- ================================================================== -->
 
 <?php $this->load->view ('footer'); ?>
 
 <!-- ================================================================== -->
 
-</div> <!--  code_folder_content -->
-
 </body>
 
 </html>
diff --git a/codepot/src/codepot/views/code_history.php b/codepot/src/codepot/views/code_history.php
index 0a453632..f158414d 100644
--- a/codepot/src/codepot/views/code_history.php
+++ b/codepot/src/codepot/views/code_history.php
@@ -206,16 +206,16 @@ $this->load->view (
 
 </div> <!-- code_history_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!--  code_history_content -->
 
 <!---------------------------------------------------------------------------->
 
-
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  code_history_content -->
-
 </body>
 
 </html>
diff --git a/codepot/src/codepot/views/code_revision.php b/codepot/src/codepot/views/code_revision.php
index 42dccf5d..34cb4efa 100644
--- a/codepot/src/codepot/views/code_revision.php
+++ b/codepot/src/codepot/views/code_revision.php
@@ -560,15 +560,16 @@ $history = $file['history'];
 
 </div> <!-- code_revision_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- code_revision_content -->
 
 <!---------------------------------------------------------------------------->
 
-
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div> <!-- code_revision_content -->
 
 <?php if ($can_edit): ?>
 <div id="code_revision_tag_div">
@@ -643,7 +644,6 @@ $history = $file['history'];
 </div>
 <?php endif; ?>
 
-
 </body>
 
 </html>
diff --git a/codepot/src/codepot/views/code_search.php b/codepot/src/codepot/views/code_search.php
index 8f09952d..8e5c9d1e 100644
--- a/codepot/src/codepot/views/code_search.php
+++ b/codepot/src/codepot/views/code_search.php
@@ -350,6 +350,9 @@ search_and_show ($this, $project, $file['fullpath'], $revision, $pattern, $inver
 
 </div> <!-- code_search_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!--  code_search_content -->
 
 <!-- ================================================================== -->
 
@@ -357,7 +360,6 @@ search_and_show ($this, $project, $file['fullpath'], $revision, $pattern, $inver
 
 <!-- ================================================================== -->
 
-</div> <!--  code_search_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/error.php b/codepot/src/codepot/views/error.php
index cbd69dc3..0b3469c4 100644
--- a/codepot/src/codepot/views/error.php
+++ b/codepot/src/codepot/views/error.php
@@ -8,6 +8,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/project.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -56,10 +57,13 @@ $this->load->view (
 <?php print  htmlspecialchars($message) ?>
 </div>
 
-<?php $this->load->view ('footer'); ?>
+<div class='footer-pusher'></div> <!-- for sticky footer -->
 
 </div> <!-- project_error_content -->
 
+<?php $this->load->view ('footer'); ?>
+
+
 </body>
 
 </html>
diff --git a/codepot/src/codepot/views/file_delete.php b/codepot/src/codepot/views/file_delete.php
index adb7c102..ad769933 100644
--- a/codepot/src/codepot/views/file_delete.php
+++ b/codepot/src/codepot/views/file_delete.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/file.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -72,6 +73,9 @@ $this->load->view (
 
 </div>
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div>  <!-- file_delete_content -->
 
 <!---------------------------------------------------------------------------->
 
@@ -79,7 +83,6 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div>  <!-- file_delete_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/file_edit.php b/codepot/src/codepot/views/file_edit.php
index 39744021..0d136408 100644
--- a/codepot/src/codepot/views/file_edit.php
+++ b/codepot/src/codepot/views/file_edit.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/file.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -137,13 +138,16 @@ $this->load->view (
 
 </div> <!-- file_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div>
 
 </body>
 
diff --git a/codepot/src/codepot/views/file_home.php b/codepot/src/codepot/views/file_home.php
index 0f002562..e517fa67 100644
--- a/codepot/src/codepot/views/file_home.php
+++ b/codepot/src/codepot/views/file_home.php
@@ -40,7 +40,7 @@ $this->load->view (
 		),
 
 		'ctxmenuitems' => array (
-			array ("file/create/{$project->id}", $this->lang->line('New')) 
+			array ("file/create/{$project->id}", '<i class="fa fa-plus"></i> ' . $this->lang->line('New')) 
 		)
 	)
 );
@@ -146,13 +146,16 @@ else
 </div>
 </div> <!-- file_home_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- file_home_content -->
+
 <!-- ============================================================ -->
 
 <?php $this->load->view ('footer'); ?>
 
 <!-- ============================================================ -->
 
-</div> <!-- file_home_content -->
 
 </body>
 </html>
diff --git a/codepot/src/codepot/views/file_show.php b/codepot/src/codepot/views/file_show.php
index a20bd20a..d58071f6 100644
--- a/codepot/src/codepot/views/file_show.php
+++ b/codepot/src/codepot/views/file_show.php
@@ -89,9 +89,9 @@ $this->load->view (
 		),
 
 		'ctxmenuitems' => array (
-			array ("file/create/{$project->id}", $this->lang->line('New')),
-			array ("file/update/{$project->id}/{$hexname}", $this->lang->line('Edit')),
-			array ("file/delete/{$project->id}/{$hexname}", $this->lang->line('Delete'))
+			array ("file/create/{$project->id}", '<i class="fa fa-plus"></i> ' . $this->lang->line('New')),
+			array ("file/update/{$project->id}/{$hexname}", '<i class="fa fa-edit"></i> ' . $this->lang->line('Edit')),
+			array ("file/delete/{$project->id}/{$hexname}", '<i class="fa fa-trash"></i> ' . $this->lang->line('Delete'))
 		)
 	)
 );
@@ -144,6 +144,9 @@ $this->load->view (
 
 </div> <!-- file_show_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!--  file_show_content -->
 
 <!---------------------------------------------------------------------------->
 
@@ -151,7 +154,6 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  file_show_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/graph_main.php b/codepot/src/codepot/views/graph_main.php
index c21243ef..646a3da1 100644
--- a/codepot/src/codepot/views/graph_main.php
+++ b/codepot/src/codepot/views/graph_main.php
@@ -10,6 +10,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/project.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -499,14 +501,15 @@ $this->load->view (
 
 </div> <!-- graph_main_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!--  graph_main_content -->
 
 <!-- /////////////////////////////////////////////////////////////////////// -->
 
 <?php $this->load->view ('footer'); ?>
 
 <!-- /////////////////////////////////////////////////////////////////////// -->
- 
-</div> <!--  graph_main_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/issue_delete.php b/codepot/src/codepot/views/issue_delete.php
index 1662088a..33ef9aa4 100644
--- a/codepot/src/codepot/views/issue_delete.php
+++ b/codepot/src/codepot/views/issue_delete.php
@@ -6,6 +6,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/issue.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -72,6 +74,9 @@ $this->load->view (
 
 </div> <!-- mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div>  <!-- project_issue_delete_content -->
 
 <!---------------------------------------------------------------------------->
 
@@ -79,7 +84,6 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div>  <!-- project_issue_delete_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/issue_edit.php b/codepot/src/codepot/views/issue_edit.php
index 47a54b9c..442a8f08 100644
--- a/codepot/src/codepot/views/issue_edit.php
+++ b/codepot/src/codepot/views/issue_edit.php
@@ -6,6 +6,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/issue.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -155,13 +157,16 @@ $this->load->view (
 
 </div> <!-- issue_edit_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div>
 
 </body>
 
diff --git a/codepot/src/codepot/views/issue_home.php b/codepot/src/codepot/views/issue_home.php
index 94a1dddc..d802872e 100644
--- a/codepot/src/codepot/views/issue_home.php
+++ b/codepot/src/codepot/views/issue_home.php
@@ -8,6 +8,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/issue.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -84,7 +85,7 @@ $this->load->view (
 		),
 
 		'ctxmenuitems' => array (
-			array ("issue/create/{$project->id}", $this->lang->line('New'), 'issue_home_new')
+			array ("issue/create/{$project->id}", '<i class="fa fa-plus"></i> ' . $this->lang->line('New'), 'issue_home_new')
 		)
 	)
 ); 
@@ -223,6 +224,10 @@ else
 
 </div> <!-- issue_home_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- issue_home_content -->
+
 <!-- ============================================================ -->
 
 <?php $this->load->view ('footer'); ?>
@@ -230,7 +235,6 @@ else
 <!-- ============================================================ -->
 
 
-</div> <!-- issue_home_content -->
 
 </body>
 </html>
diff --git a/codepot/src/codepot/views/issue_show.php b/codepot/src/codepot/views/issue_show.php
index 05abc10a..7a7480bf 100644
--- a/codepot/src/codepot/views/issue_show.php
+++ b/codepot/src/codepot/views/issue_show.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/issue.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -188,9 +189,9 @@ $this->load->view (
 		),
 
 		'ctxmenuitems' => array (
-			array ("issue/create/{$project->id}", $this->lang->line('New')),
-			array ("issue/update/{$project->id}/{$hexid}", $this->lang->line('Edit')),
-			array ("issue/delete/{$project->id}/{$hexid}", $this->lang->line('Delete'))
+			array ("issue/create/{$project->id}", '<i class="fa fa-plus"></i> ' . $this->lang->line('New')),
+			array ("issue/update/{$project->id}/{$hexid}", '<i class="fa fa-edit"></i> ' . $this->lang->line('Edit')),
+			array ("issue/delete/{$project->id}/{$hexid}", '<i class="fa fa-trash"></i> ' . $this->lang->line('Delete'))
 		)
 	)
 );
@@ -457,13 +458,16 @@ $this->load->view (
 
 </div> <!-- issue_show_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!--  issue_show_content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  issue_show_content -->
 
 <?php 
 	$creole_base = site_url() . "/wiki/show/{$project->id}/"; 
diff --git a/codepot/src/codepot/views/log.php b/codepot/src/codepot/views/log.php
index d5a729b1..94a9648d 100644
--- a/codepot/src/codepot/views/log.php
+++ b/codepot/src/codepot/views/log.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/log.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -296,9 +297,12 @@ $this->load->view (
 
 </div> <!-- log_mainarea -->
 
-<?php $this->load->view ('footer'); ?>
+<div class='footer-pusher'></div> <!-- for sticky footer -->
 
 </div> <!-- log_content -->
 
+<?php $this->load->view ('footer'); ?>
+
+
 </body>
 </html>
diff --git a/codepot/src/codepot/views/login.php b/codepot/src/codepot/views/login.php
index aa7a4228..eea897a0 100644
--- a/codepot/src/codepot/views/login.php
+++ b/codepot/src/codepot/views/login.php
@@ -4,6 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -107,6 +109,10 @@ $this->load->view (
 
 </div>
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
@@ -114,7 +120,6 @@ $this->load->view (
 <!---------------------------------------------------------------------------->
 
 
-</div>
 
 </body>
 </html>
diff --git a/codepot/src/codepot/views/project_catalog.php b/codepot/src/codepot/views/project_catalog.php
index ba1c1d08..d72f22fb 100644
--- a/codepot/src/codepot/views/project_catalog.php
+++ b/codepot/src/codepot/views/project_catalog.php
@@ -7,6 +7,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/project.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -33,7 +34,7 @@ function prepare_page_button (i, req_size)
 			var filter = codepot_ascii_to_hex(last_successful_filter);
 			var offset = parseInt($(this).text());
 			$.ajax({
-				url: codepot_merge_path("<?php print site_url(); ?>", "/project/catalog_json/" + filter + "/" + ((offset  - 1) * req_size)),
+				url: codepot_merge_path("<?php print site_url(); ?>", "/project/enjson_catalog/" + filter + "/" + ((offset  - 1) * req_size)),
 				dataType: "json",
 				success: function(data) { render_project_list (data); }
 			});
@@ -146,7 +147,7 @@ $(function () {
 			var filter = codepot_ascii_to_hex(last_attempted_filter);
 
 			$.ajax({
-				url: codepot_merge_path("<?php print site_url(); ?>", "/project/catalog_json/" + filter),
+				url: codepot_merge_path("<?php print site_url(); ?>", "/project/enjson_catalog/" + filter),
 				dataType: "json",
 				success: function(data) { render_project_list (data); }
 			});
@@ -187,9 +188,7 @@ $this->load->view (
 		),
 
 		'ctxmenuitems' => array (
-			array ("project/create", 
-			       $this->lang->line('New'),
-			       'project_catalog_new')
+			array ("project/create", '<i class="fa fa-plus"></i> ' . $this->lang->line('New'), 'project_catalog_new')
 		)
 	)
 ); 
@@ -271,6 +270,10 @@ else
 
 </div> <!-- project_catalog_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- project_catalog_content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
@@ -278,7 +281,6 @@ else
 <!---------------------------------------------------------------------------->
 
 
-</div> <!-- project_catalog_content -->
 
 </body>
 </html>
diff --git a/codepot/src/codepot/views/project_delete.php b/codepot/src/codepot/views/project_delete.php
index 75f4ebf6..16f36ec6 100644
--- a/codepot/src/codepot/views/project_delete.php
+++ b/codepot/src/codepot/views/project_delete.php
@@ -7,6 +7,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/project.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -69,15 +71,17 @@ $this->load->view (
 <?php print form_close();?>
 </div>
 
-</div>
+</div> <!-- mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div>  <!-- project_delete_content -->
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div>  <!-- project_delete_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/project_edit.php b/codepot/src/codepot/views/project_edit.php
index 1ac43620..600a4698 100644
--- a/codepot/src/codepot/views/project_edit.php
+++ b/codepot/src/codepot/views/project_edit.php
@@ -6,6 +6,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/project.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -175,13 +177,16 @@ $this->load->view (
 
 </div> <!-- project_edit_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- project_edit_content --> 
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div> <!-- project_edit_content --> 
 
 </body>
 
diff --git a/codepot/src/codepot/views/project_home.php b/codepot/src/codepot/views/project_home.php
index c6aa7467..6372ac9d 100644
--- a/codepot/src/codepot/views/project_home.php
+++ b/codepot/src/codepot/views/project_home.php
@@ -10,6 +10,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/project.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -91,8 +92,9 @@ $this->load->view (
 		),
 
 		'ctxmenuitems' => array (
-			array ("project/update/{$project->id}", $this->lang->line('Edit')),
-			array ("project/delete/{$project->id}", $this->lang->line('Delete'))
+			array ("project/create", '<i class="fa fa-plus"></i> ' . $this->lang->line('New')),
+			array ("project/update/{$project->id}", '<i class="fa fa-edit"></i> ' . $this->lang->line('Edit')),
+			array ("project/delete/{$project->id}", '<i class="fa fa-trash"></i> ' . $this->lang->line('Delete'))
 		)
 	)
 ); 
@@ -317,6 +319,9 @@ foreach ($urls as $url)
 
 </div> <!-- project_home_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!--  project_home_content -->
 
 <!-- /////////////////////////////////////////////////////////////////////// -->
 
@@ -324,7 +329,6 @@ foreach ($urls as $url)
 
 <!-- /////////////////////////////////////////////////////////////////////// -->
  
-</div> <!--  project_home_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/projectbar.php b/codepot/src/codepot/views/projectbar.php
index f327a254..17282443 100644
--- a/codepot/src/codepot/views/projectbar.php
+++ b/codepot/src/codepot/views/projectbar.php
@@ -1,4 +1,10 @@
-<div class="projectbar">
+<div id="codepot-projectbar" class="projectbar">
+
+<script type="text/javascript">
+$(function() {
+	$("#codepot-projectbar .button").button();
+});
+</script>
 
 <?php
 function show_projectbar ($con, $banner, $page, $ctxmenuitems)
@@ -55,6 +61,7 @@ function show_projectbar ($con, $banner, $page, $ctxmenuitems)
 	{
 		$menuitems = array (
 			array ("project/home/{$project->id}", $con->lang->line('Overview')),
+			//array ("project/home/{$project->id}", '<i class="fa fa-code fa-2x"></i>'),
 			array ("wiki/home/{$project->id}", $con->lang->line('Wiki')),
 			array ("issue/home/{$project->id}", $con->lang->line('Issues')),
 			array ("code/home/{$project->id}", $con->lang->line('Code')),
@@ -65,7 +72,7 @@ function show_projectbar ($con, $banner, $page, $ctxmenuitems)
 		foreach ($menuitems as $item)
 		{
 			$menuid = substr ($item[0], 0, strpos($item[0], '/'));
-			$extra = ($menuid == $id)? 'class="selected"': '';
+			$extra = ($menuid == $id)? 'class="selected button"': 'class="button"';
 			$menulink = $item[0];
 
 			print anchor ($menulink, $item[1], $extra);
@@ -81,7 +88,7 @@ function show_projectbar ($con, $banner, $page, $ctxmenuitems)
 		foreach ($menuitems as $item)
 		{
 			$menuid = substr ($item[0], strpos($item[0], '/') + 1);
-			$extra = ($menuid == $id)? 'class="selected"': '';
+			$extra = ($menuid == $id)? 'class="selected button"': 'class="button"';
 			$menulink = $item[0];
 
 			print anchor ($menulink, $item[1], $extra);
@@ -98,7 +105,7 @@ function show_projectbar ($con, $banner, $page, $ctxmenuitems)
 		foreach ($menuitems as $item)
 		{
 			$menuid = substr ($item[0], strpos($item[0], '/') + 1);
-			$extra = ($menuid == $id)? 'class="selected"': '';
+			$extra = ($menuid == $id)? 'class="selected button"': 'class="button"';
 			$menulink = $item[0];
 
 			print anchor ($menulink, $item[1], $extra);
diff --git a/codepot/src/codepot/views/site_catalog.php b/codepot/src/codepot/views/site_catalog.php
index 5fb6e281..2e493508 100644
--- a/codepot/src/codepot/views/site_catalog.php
+++ b/codepot/src/codepot/views/site_catalog.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/site.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -41,7 +42,7 @@ $this->load->view (
 		),
 
 		'ctxmenuitems' => array (
-			array ('site/create', $this->lang->line('New'))
+			array ('site/create', '<i class="fa fa-plus"></i> ' . $this->lang->line('New'))
 		)
 	)
 );
@@ -67,6 +68,10 @@ foreach ($sites as $site)
 
 </div> <!-- site_catalog_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- site_catalog_content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
@@ -74,7 +79,6 @@ foreach ($sites as $site)
 <!---------------------------------------------------------------------------->
 
 
-</div> <!-- site_catalog_content -->
 
 </body>
 </html>
diff --git a/codepot/src/codepot/views/site_delete.php b/codepot/src/codepot/views/site_delete.php
index 9b247ac1..f6a9f9a9 100644
--- a/codepot/src/codepot/views/site_delete.php
+++ b/codepot/src/codepot/views/site_delete.php
@@ -6,6 +6,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/site.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -69,7 +71,11 @@ $this->load->view (
 <?php print form_close();?>
 </div>
 
-</div>
+</div> <!-- mainarea -->
+
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div>  <!-- site_delete_content -->
 
 <!---------------------------------------------------------------------------->
 
@@ -77,7 +83,6 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div>  <!-- site_delete_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/site_edit.php b/codepot/src/codepot/views/site_edit.php
index 00e31dd3..9382805a 100644
--- a/codepot/src/codepot/views/site_edit.php
+++ b/codepot/src/codepot/views/site_edit.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/site.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
@@ -130,13 +131,16 @@ $this->load->view (
 
 </div> <!-- site_edit_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- site_edit_content --> 
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div> <!-- site_edit_content --> 
 
 </body>
 
diff --git a/codepot/src/codepot/views/site_home.php b/codepot/src/codepot/views/site_home.php
index a9483926..ace7ee4a 100644
--- a/codepot/src/codepot/views/site_home.php
+++ b/codepot/src/codepot/views/site_home.php
@@ -8,6 +8,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/site.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -352,9 +354,12 @@ foreach ($latest_projects as $project)
 
 </div> <!-- site_home_mainarea -->
 
-<?php $this->load->view ('footer'); ?>
+<div class='footer-pusher'></div> <!-- for sticky footer -->
 
 </div> <!-- site_home_content -->
 
+<?php $this->load->view ('footer'); ?>
+
+
 </body>
 </html>
diff --git a/codepot/src/codepot/views/site_show.php b/codepot/src/codepot/views/site_show.php
index 195e8dc3..bb5093d9 100644
--- a/codepot/src/codepot/views/site_show.php
+++ b/codepot/src/codepot/views/site_show.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/site.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -54,26 +55,26 @@ function render_wiki()
 if ($login['sysadmin?'])
 {
 	$ctxmenuitems = array (
-		//array ("site/create", $this->lang->line('New')),
-		array ("site/update/{$site->id}", $this->lang->line('Edit')),
-		array ("site/delete/{$site->id}", $this->lang->line('Delete'))
+		//array ("site/create", '<i class="fa fa-plus"></i> ' . $this->lang->line('New')),
+		array ("site/update/{$site->id}", '<i class="fa fa-edit"></i> ' . $this->lang->line('Edit')),
+		array ("site/delete/{$site->id}", '<i class="fa fa-trash"></i> ' . $this->lang->line('Delete'))
 	);
 }
 else $ctxmenuitems = array ();
 
 $this->load->view (
-        'projectbar',
-        array (
+	'projectbar',
+	array (
 		'banner' => $this->lang->line('Administration'),
 
 		'page' => array (
 			'type' => 'site',
 			'id' => 'catalog',
 			'site' => $site,
-                ),
+		),
 
-                'ctxmenuitems' => $ctxmenuitems
-        )
+		'ctxmenuitems' => $ctxmenuitems
+	)
 );
 ?>
 
@@ -95,9 +96,12 @@ $this->load->view (
 
 </div> <!-- site_show_mainarea -->
 
-<?php $this->load->view ('footer'); ?>
+<div class='footer-pusher'></div> <!-- for sticky footer -->
 
 </div> <!-- site_show_content -->
 
+<?php $this->load->view ('footer'); ?>
+
+
 </body>
 </html>
diff --git a/codepot/src/codepot/views/taskbar.php b/codepot/src/codepot/views/taskbar.php
index 2a1c9f3d..c2976a04 100644
--- a/codepot/src/codepot/views/taskbar.php
+++ b/codepot/src/codepot/views/taskbar.php
@@ -3,6 +3,7 @@
 function show_taskbar ($con, $login)
 { 
 	print '<div class="taskbar">';
+	print "\n";
 
 	print '<div class="boxb">';
 
@@ -163,7 +164,7 @@ $(function () {
 			var term = codepot_string_to_hex(request.term);
 
 			$.ajax({
-				url: codepot_merge_path("<?php print site_url(); ?>", "/project/quickfind_json/" + term),
+				url: codepot_merge_path("<?php print site_url(); ?>", "/project/enjson_quickfind/" + term),
 				dataType: "json",
 				success: function(data) { response(data); },
 			});
diff --git a/codepot/src/codepot/views/user_home.php b/codepot/src/codepot/views/user_home.php
index d6d5a8ce..519228c8 100644
--- a/codepot/src/codepot/views/user_home.php
+++ b/codepot/src/codepot/views/user_home.php
@@ -6,6 +6,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/user.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
      
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -114,6 +116,10 @@ $num_activities = 0;
 
 </div> <!-- user_home_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- user_home_content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
@@ -121,7 +127,6 @@ $num_activities = 0;
 <!---------------------------------------------------------------------------->
 
 
-</div> <!-- user_home_content -->
 
 
 </body>
diff --git a/codepot/src/codepot/views/user_settings.php b/codepot/src/codepot/views/user_settings.php
index 3f0fe5ab..a311db0b 100644
--- a/codepot/src/codepot/views/user_settings.php
+++ b/codepot/src/codepot/views/user_settings.php
@@ -6,6 +6,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/user.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
      
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -88,6 +90,10 @@ $this->load->view (
 
 </div> <!-- user_settings_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- user_settings_content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
@@ -95,7 +101,5 @@ $this->load->view (
 <!---------------------------------------------------------------------------->
 
 
-</div> <!-- user_settings_content -->
-
 </body>
 </html>
diff --git a/codepot/src/codepot/views/wiki_delete.php b/codepot/src/codepot/views/wiki_delete.php
index 8b061cbe..570a892c 100644
--- a/codepot/src/codepot/views/wiki_delete.php
+++ b/codepot/src/codepot/views/wiki_delete.php
@@ -6,6 +6,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/wiki.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -72,6 +74,9 @@ $this->load->view (
 
 </div> <!-- mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div>  <!-- wiki_delete_content -->
 
 <!---------------------------------------------------------------------------->
 
@@ -79,7 +84,6 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div>  <!-- wiki_delete_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/wiki_edit.php b/codepot/src/codepot/views/wiki_edit.php
index 7385cb22..2bc7ce78 100644
--- a/codepot/src/codepot/views/wiki_edit.php
+++ b/codepot/src/codepot/views/wiki_edit.php
@@ -6,6 +6,8 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/wiki.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
+
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -220,13 +222,16 @@ $this->load->view (
 
 </div> <!-- wiki_edit_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div>
 
 </body>
 
diff --git a/codepot/src/codepot/views/wiki_home.php b/codepot/src/codepot/views/wiki_home.php
index 67d9b0f3..57251d2d 100644
--- a/codepot/src/codepot/views/wiki_home.php
+++ b/codepot/src/codepot/views/wiki_home.php
@@ -8,6 +8,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/wiki.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
@@ -39,7 +40,7 @@ $this->load->view (
 		),
 
 		'ctxmenuitems' => array (
-			array ("wiki/create/{$project->id}", $this->lang->line('New')) 
+			array ("wiki/create/{$project->id}", '<i class="fa fa-plus"></i> ' . $this->lang->line('New')) 
 		)
 	)
 ); 
@@ -70,6 +71,10 @@ else
 </div>
 </div> <!-- wiki_home_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!-- wiki_home_content -->
+
 <!-- =================================================================== -->
 
 <?php $this->load->view ('footer'); ?>
@@ -77,7 +82,6 @@ else
 <!-- =================================================================== -->
 
 
-</div> <!-- wiki_home_content -->
 
 </body>
 </html>
diff --git a/codepot/src/codepot/views/wiki_show.php b/codepot/src/codepot/views/wiki_show.php
index 11a805ac..2b02b3e6 100644
--- a/codepot/src/codepot/views/wiki_show.php
+++ b/codepot/src/codepot/views/wiki_show.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php print base_url_make('/js/codepot.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
 <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/wiki.css')?>" />
+<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/font-awesome.min.css')?>" />
 
 <script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script>
 
@@ -104,9 +105,9 @@ $this->load->view (
 		),
 
 		'ctxmenuitems' => array (
-			array ("wiki/create/{$project->id}", $this->lang->line('New')),
-			array ("wiki/update/{$project->id}/{$hexname}", $this->lang->line('Edit')),
-			array ("wiki/delete/{$project->id}/{$hexname}", $this->lang->line('Delete'))
+			array ("wiki/create/{$project->id}", '<i class="fa fa-plus"></i> ' . $this->lang->line('New')),
+			array ("wiki/update/{$project->id}/{$hexname}", '<i class="fa fa-edit"></i> ' .$this->lang->line('Edit')),
+			array ("wiki/delete/{$project->id}/{$hexname}", '<i class="fa fa-trash"></i> ' .$this->lang->line('Delete'))
 		)
 	)
 );
@@ -166,13 +167,16 @@ $this->load->view (
 
 </div> <!-- wiki_show_mainarea -->
 
+<div class='footer-pusher'></div> <!-- for sticky footer -->
+
+</div> <!--  wiki_show_content -->
+
 <!---------------------------------------------------------------------------->
 
 <?php $this->load->view ('footer'); ?>
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  wiki_show_content -->
 
 </body>
 
diff --git a/codepot/src/css/code.css b/codepot/src/css/code.css
index 654fbc93..26ffe14b 100644
--- a/codepot/src/css/code.css
+++ b/codepot/src/css/code.css
@@ -305,16 +305,12 @@
 }
 
 #code_diff_mainarea_result_fullview .navigator {
-	background-color: #7777FF;
-	color: #FFFFFF;
+	padding: 0.5em 0.8em 0.5em 0.8em;
 	font-weight: bold;
-	padding-left: 1em;
-}
-
-#code_diff_mainarea_result_fullview .navigator a {
-	color: #FFFFFF;
-	font-weight: bold;
-	font-decoration: none;
+	text-align: left;
+	color: #1C94C4;
+	background-color: #E5ECF9;
+	white-space: nowrap;
 }
 
 #code_diff_mainarea_result_fullview .diff {
diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css
index fd9313c9..433631d4 100644
--- a/codepot/src/css/common.css
+++ b/codepot/src/css/common.css
@@ -1,17 +1,25 @@
+
 html {
+	height: 100%; /* for sticky footer */
 }
 
 body {
 	padding: 0;
-	margin: 4px 4px 4px 4px;
-	/*margin: 0;*/
-	/* color: #333333; */
+	/*margin: 4px 4px 4px 4px;*/
+	margin: 0;
 	min-width: 600px;
+
+	height: 100%; /* for sticky footer */
 }
 
 .content {
 	font-size: 0.9em;
-	font-family: Ubuntu, "Trebuchet MS", Tahoma, Verdana, sans-serif;
+	font-family: /*Ubuntu,*/ "Trebuchet MS", Tahoma, Verdana, sans-serif;
+
+	min-height: 100%; /* for stick footer */
+	height: auto !important; /* for stick footer */
+	height: 100%; /* for stick footer */
+	margin: 0 auto -40px; /* for stick footer */
 }
 
 .content h1 {
@@ -161,24 +169,14 @@ body {
 
 .content .taskbar {
 	font-size: 1em;
-	/*font-weight: bold;*/
 	text-transform: uppercase;
 	padding: 0.5em 0.2em 0.5em 0.2em;
 	color: #ffffff;
-	background-color: #203150;
+	background-color: #2F2F2F;
+	background-color: rgba(47,47,47,0.95);
 
 	line-height: 2em;
 	vertical-align: middle;
-
-	/*
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	*/
-
-	/*-webkit-box-shadow: 0 8px 6px -6px #777;
-	-moz-box-shadow: 0 8px 6px -6px #777;
-	box-shadow: 0 8px 6px -6px #777;*/
 }
 
 .content .taskbar .boxa {
@@ -222,70 +220,85 @@ body {
 }
 
 .content .projectbar {
-	/*margin: 0.1em 0em 0em 0em;*/
+	position: relative;  /* required for absolute position of .ctxmenu and .fixedmenu */
+
+	color: #333333;
+	/*overflow: auto;*/
+	overflow: inherit;
+	vertical-align: middle;
+
+	height: 4.5em;
+
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	width: 100%;
+
+	background-color: #F5F5F5;
+	border-bottom: 1px solid #CCCCCC;
+	margin-bottom: 0.5em;
 	padding: 0.5em 0.5em 0.5em 0.5em;
-	color: #FFFFFF;
-	background-color: #4665A2;
-	background-image: url("images/three-d.png");
-	background-repeat: repeat;
 }
 
 .content .projectbar .title {
-	font-size: 2em;
-	font-weight: bold;
+	font-size: 2.2em;
 	text-transform: uppercase;
 	white-space: nowrap;
-
-	/*text-shadow: 2px 8px 6px rgba(0,0,0,0.2),
-	            0px -5px 35px rgba(255,255,255,0.3); */
-	text-shadow: 1px 1px 0 #7A7A7A;
-	letter-spacing: 0.1em;
 }
 
 .content .projectbar .ctxmenu {
-	float: right;
+	position: absolute;
+	bottom: 0;
+	right: 3px;
+
 	padding: 0.1em 0em 0.1em 0em;
 	line-height: 2em;
 }
 
 .content .projectbar .fixedmenu {
-	float: none;
 	padding: 0.1em 0em 0.1em 0em;
-	line-height: 2em;
+	position: absolute;
+	top: 3px;
+	right: 2px;
+	padding: 0;
 }
 
-.content .projectbar .fixedmenu a {
-	padding: 6px;
-	color: #FFFFFF;
+/*
+.content .projectbar .fixedmenu a,
+.content .projectbar .fixedmenu a:visited {
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+	color: #AAAAAA;
 }
 
+
 .content .projectbar .fixedmenu a:hover {
-	padding: 6px;
-	background-color: #6482A9;
-	color: #FFFFFF;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
+	color: #333333;
+}*/
+
 
 .content .projectbar .fixedmenu a.selected {
-	padding: 6px;
-	color: #333333;
-	background-color: #FFFFFF;
-	-moz-border-radius: 3px;
+	/*padding: 6px;*/
+	color: #EB8F00;
+	border-color: #EB8F00;
+	/*background-color: #FFFFFF;*/
+/*	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
+	border-radius: 3px;*/
+
+	/*border-bottom: 3px solid red;*/
+} 
+
 
 .content .projectbar .fixedmenu a.selected:hover {
-	padding: 6px;
-	background-color: #6482A9;
-	color: #FFFFFF;
+	/*padding: 6px;*/
+	/*background-color: #6482A9;
+	color: #FFFFFF;*/
 }
 
 .content .projectbar .ctxmenu a {
 	padding: 6px;
-	color: #FFFFFF;
+	/*color: #FFFFFF;*/
 }
 
 .content .projectbar .ctxmenu a:hover {
@@ -361,7 +374,7 @@ body {
 	padding-bottom: 0.3em;
 	vertical-align: middle;
 	font-size: 1em;
-	border: 1px solid #CCDDEE;
+	/*border: 1px solid #CCDDEE;*/
 }
 
 .content .mainarea form {
@@ -708,6 +721,7 @@ body {
 	width: 22em;
 	margin-top: 0.3em;
 	margin-left: 0.5em;
+	margin-right: 0.5em;
 }
 
 .content .sidebar .collapsible-box {
@@ -794,33 +808,6 @@ body {
 	padding: 0.5em 0.2em 0.5em 0.2em;
 }
 
-.content .footer {
-	clear: both;
-	padding: 0.3em 0.5em 0.3em 0.5em;
-	font-size: 1em;
-	/*font-weight: bold;*/
-	/*font-style: italic;*/
-	text-align: right;
-	color: #FFFFFF;
-	background-color: #4665A2;
-	background-color: #203150;
-	line-height: 2em;
-
-	/*
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	*/
-
-	/*-webkit-box-shadow: 0 8px 6px -6px #777;
-	-moz-box-shadow: 0 8px 6px -6px #777;
-	box-shadow: 0 8px 6px -6px #777;*/
-}
-
-.content .footer a {
-	color: #FFFFFF;
-}
-
 .content .form_message {
 	color: red;
 }
@@ -860,6 +847,36 @@ body {
 	margin-top: -5px; 
 }
 
+/* === footer === */
+
+.content .footer-pusher {
+	clear: both;
+	height: 40px; /* for sticky footer */
+}
+
+.footer {
+	clear: both;
+	text-align: right;
+	vertical-align: middle;
+	padding-right: 0.5em;
+	padding-right: 0.5em;
+
+	color: #CCCCCC;
+	background-color: #2F2F2F;
+	background-color: rgba(47,47,47,0.95);
+	font-weight: bold;
+
+	font-size: 0.9em;
+	font-family: /*Ubuntu,*/ "Trebuchet MS", Tahoma, Verdana, sans-serif;
+	height: 40px;      /* for sticky footer */
+	line-height: 40px;
+}
+
+
+.footer a {
+	color: #FFFFFF;
+}
+
 /* === signin panel === */
 #taskbar_signinout_form fieldset {
 	margin: 0;
diff --git a/codepot/src/css/images/Makefile.am b/codepot/src/css/images/Makefile.am
index 66e7e585..466f04ef 100644
--- a/codepot/src/css/images/Makefile.am
+++ b/codepot/src/css/images/Makefile.am
@@ -37,7 +37,6 @@ www_DATA =  \
 	submitbg.png \
 	t-node.png \
 	textbg.png \
-	three-d.png \
 	toggledown.png \
 	toggleup.png \
 	ui-bg_flat_0_aaaaaa_40x100.png \
diff --git a/codepot/src/css/images/Makefile.in b/codepot/src/css/images/Makefile.in
index bd4391a6..28ca21b3 100644
--- a/codepot/src/css/images/Makefile.in
+++ b/codepot/src/css/images/Makefile.in
@@ -236,7 +236,6 @@ www_DATA = \
 	submitbg.png \
 	t-node.png \
 	textbg.png \
-	three-d.png \
 	toggledown.png \
 	toggleup.png \
 	ui-bg_flat_0_aaaaaa_40x100.png \
diff --git a/codepot/src/css/images/three-d.png b/codepot/src/css/images/three-d.png
deleted file mode 100644
index 1a67072a..00000000
Binary files a/codepot/src/css/images/three-d.png and /dev/null differ
diff --git a/codepot/src/css/project.css b/codepot/src/css/project.css
index 5e53db88..bb21a83f 100644
--- a/codepot/src/css/project.css
+++ b/codepot/src/css/project.css
@@ -79,7 +79,7 @@
 }
 
 #project_catalog_mainarea_search_form {
-	margin-top: 1em;
+	/*margin-top: 1em;*/
 }
 
 #project_catalog_mainarea_search_form form {