clean up menu
resolve menu conflict
more clean up for Smarty 3.0 and another pass at cleaning the top menus