diff --git a/src/main/scala/bootstrap/liftweb/Boot.scala b/src/main/scala/bootstrap/liftweb/Boot.scala
index f165819..671fa5a 100644
--- a/src/main/scala/bootstrap/liftweb/Boot.scala
+++ b/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -177,11 +177,11 @@
         Menu(Loc("user", List("info_view", "user"), "User Info", ifIsLoggedIn,
           Loc.Snippet("user_info", UserDisplay.userInfo))) ::
         logLevel.menu  ::
-        Menu(Loc("tag", List("info_view", "tag"), "Tag", ifIsLoggedIn,
+        Menu(Loc("tag", List("tag"), "Tag", ifIsLoggedIn,
           Loc.Snippet("tag_display", TagDisplay.display))) ::
-        Menu(Loc("public", List("info_view", "public"), S.?("base_profile_public"), ifIsLoggedIn)) ::
-        Menu(Loc("contacts", List("info_view", "contacts"), S.?("base_profile_contacts"), ifIsLoggedIn)) ::
-        Menu(Loc("sign_up", List("signup"), S.?("base_menu_signup"),
+        Menu(Loc("public", List("public"), S.?("base_profile_public"), ifIsLoggedIn)) ::
+        Menu(Loc("contacts", List("contacts"), S.?("base_profile_contacts"), ifIsLoggedIn)) ::
+        Menu(Loc("signup", List("signup"), S.?("base_menu_signup"),
           Snippet("signup", User.signupForm),
           Unless(User.loggedIn_? _, S.?("base_menu_sign_up_error")))) ::
         Menu(Loc("logout", List("logout"), S.?("base_menu_logout"),
diff --git a/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala b/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
index c3485a4..c27543c 100755
--- a/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
+++ b/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
@@ -59,7 +59,7 @@
   val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
 
   val menuItems =
-  Menu(Loc("accessPools", new Link("pools_view" :: Nil, true)/*List("pools_view", "index")*/, S.?("base_pool_menu"), ifIsLoggedIn,
+  Menu(Loc("pools", new Link("pools" :: Nil, true)/*List("pools_view", "index")*/, S.?("base_pool_menu"), ifIsLoggedIn,
            Loc.Snippet("addPool", addPool),
            Loc.Snippet("editPool", editPool),
            Loc.Snippet("poolUsers", displayPoolUsers),
diff --git a/src/main/scala/org/apache/esme/lib/ActionMgr.scala b/src/main/scala/org/apache/esme/lib/ActionMgr.scala
index 72a926a..2b38b28 100644
--- a/src/main/scala/org/apache/esme/lib/ActionMgr.scala
+++ b/src/main/scala/org/apache/esme/lib/ActionMgr.scala
@@ -60,7 +60,7 @@
 
   val menuItems:List[Menu] = {
     if(Props.get("esme.enable_actions").openOr("true") == "true") {
-      Menu(Loc("actionMgt", List("action_view", "index"), S.?("base_actions_menu"), ifIsLoggedIn,
+      Menu(Loc("actions", List("actions"), S.?("base_actions_menu"), ifIsLoggedIn,
            Loc.Snippet("displayActions", displayActions),
            Loc.Snippet("main", mainActions))) :: Nil     
     } else {
diff --git a/src/main/scala/org/apache/esme/lib/AuthMgr.scala b/src/main/scala/org/apache/esme/lib/AuthMgr.scala
index 9cfe83a..a29bc99 100755
--- a/src/main/scala/org/apache/esme/lib/AuthMgr.scala
+++ b/src/main/scala/org/apache/esme/lib/AuthMgr.scala
@@ -56,7 +56,7 @@
 
   val menuItems:List[Menu] = {
     if(Props.get("esme.enable_tokens").openOr("true") == "true") {
-      Menu(Loc("authToken", List("auth_view", "index"), S.?("base_token_menu"), ifIsLoggedIn,
+      Menu(Loc("tokens", List("tokens"), S.?("base_token_menu"), ifIsLoggedIn,
            Loc.Snippet("displayTokens", displayTokens),
            Loc.Snippet("main", mainTokens))) :: Nil   
     } else {
diff --git a/src/main/scala/org/apache/esme/lib/ConversationMgr.scala b/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
index 7ae8c29..1bcf49f 100755
--- a/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
+++ b/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
@@ -49,7 +49,7 @@
   val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
 
   val menuItems =
-  Menu(Loc("conversation", List("info_view", "conversation"), S.?("base_conv_menu"), ifIsLoggedIn,
+  Menu(Loc("conversation", List("conversation"), S.?("base_conv_menu"), ifIsLoggedIn,
            Loc.Snippet("conv_info", convInfo))) :: Nil         
   
   def convInfo(in: NodeSeq): NodeSeq = {  
diff --git a/src/main/scala/org/apache/esme/lib/ProfileMgr.scala b/src/main/scala/org/apache/esme/lib/ProfileMgr.scala
index 35111af..b584e72 100755
--- a/src/main/scala/org/apache/esme/lib/ProfileMgr.scala
+++ b/src/main/scala/org/apache/esme/lib/ProfileMgr.scala
@@ -54,7 +54,7 @@
   val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
 
   val menuItems =
-  Menu(Loc("profile", List("profile_view", "edit"), S.?("base_profile_menu"), ifIsLoggedIn,
+  Menu(Loc("profile", List("profile", "edit"), S.?("base_profile_menu"), ifIsLoggedIn,
            Loc.Snippet("editProfile", editProfile))) ::
   Nil
 
diff --git a/src/main/scala/org/apache/esme/lib/SearchMgr.scala b/src/main/scala/org/apache/esme/lib/SearchMgr.scala
index bd39c4d..9046dba 100755
--- a/src/main/scala/org/apache/esme/lib/SearchMgr.scala
+++ b/src/main/scala/org/apache/esme/lib/SearchMgr.scala
@@ -49,7 +49,7 @@
   val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
 
   val menuItems =
-  Menu(Loc("search", List("info_view", "search"), S.?("base_menu_search"), ifIsLoggedIn,
+  Menu(Loc("search", List("search"), S.?("base_menu_search"), ifIsLoggedIn,
            Loc.Snippet("display_search", displaySearch),
            Loc.Snippet("searchTerm", searchTerm))) ::
   Nil                                        
diff --git a/src/main/scala/org/apache/esme/lib/StreamMgr.scala b/src/main/scala/org/apache/esme/lib/StreamMgr.scala
index 2369680..fdcb0c7 100755
--- a/src/main/scala/org/apache/esme/lib/StreamMgr.scala
+++ b/src/main/scala/org/apache/esme/lib/StreamMgr.scala
@@ -58,7 +58,7 @@
   val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
 
   val menuItems =
-  Menu(Loc("streams", List("info_view", "streams"), S.?("base_streams_menu"), ifIsLoggedIn,
+  Menu(Loc("streams", List("streams"), S.?("base_streams_menu"), ifIsLoggedIn,
            Loc.Snippet("stream_display", StreamDisplay.display))) ::
   Nil
 
diff --git a/src/main/scala/org/apache/esme/lib/TrackMgr.scala b/src/main/scala/org/apache/esme/lib/TrackMgr.scala
index a2a0c95..e52c222 100755
--- a/src/main/scala/org/apache/esme/lib/TrackMgr.scala
+++ b/src/main/scala/org/apache/esme/lib/TrackMgr.scala
@@ -53,7 +53,7 @@
 
   val menuItems:List[Menu] = {
     if(Props.get("esme.enable_tracks").openOr("true") == "true") {
-      Menu(Loc("trackMgt", List("track_view", "index"), S.?("base_track_menu"), ifIsLoggedIn,
+      Menu(Loc("tracks", List("tracks"), S.?("base_track_menu"), ifIsLoggedIn,
              Loc.Snippet("displayTracking", displayTracking),
              Loc.Snippet("main", mainTracking))) :: Nil
     } else {
diff --git a/src/main/scala/org/apache/esme/lib/UserMgr.scala b/src/main/scala/org/apache/esme/lib/UserMgr.scala
index e1ce8f5..e952075 100644
--- a/src/main/scala/org/apache/esme/lib/UserMgr.scala
+++ b/src/main/scala/org/apache/esme/lib/UserMgr.scala
@@ -49,7 +49,7 @@
   val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
 
   val menuItems =
-  Menu(Loc("list_users", List("info_view", "users"), S.?("base_users_menu"), ifIsLoggedIn,
+  Menu(Loc("users", List("users"), S.?("base_users_menu"), ifIsLoggedIn,
            Loc.Snippet("displayUsers", displayUsers))) ::
   Nil
 
diff --git a/src/main/scala/org/apache/esme/snippet/MenuSnippet.scala b/src/main/scala/org/apache/esme/snippet/MenuSnippet.scala
index d181476..ff9d622 100644
--- a/src/main/scala/org/apache/esme/snippet/MenuSnippet.scala
+++ b/src/main/scala/org/apache/esme/snippet/MenuSnippet.scala
@@ -38,26 +38,26 @@
     
     val itemTracks: NodeSeq = 
       if(Props.get("esme.enable_tracks").openOr("true") == "true") {
-        <li><lift:Menu.item donthide="true" name="trackMgt" a:class="tipelement" a:title="You can track words."/></li> 
+        <li><lift:Menu.item donthide="true" name="tracks" a:class="tipelement" a:title="You can track words."/></li> 
       } else {
         List()
       }
     
     val itemActions: NodeSeq = 
       if(Props.get("esme.enable_actions").openOr("true") == "true") {
-        <li><lift:Menu.item donthide="true" name="actionMgt" a:class="tipelement" a:title="You can create actions to fire when certain events occur"/></li>  
+        <li><lift:Menu.item donthide="true" name="actions" a:class="tipelement" a:title="You can create actions to fire when certain events occur"/></li>  
       } else {
         List()
       }
     
     val itemTokens: NodeSeq = 
       if(Props.get("esme.enable_tokens").openOr("true") == "true") {
-        <li><lift:Menu.item donthide="true" name="authToken" a:class="tipelement" a:title="You can create tokens to use when accessing ESME via other clients."/></li>
+        <li><lift:Menu.item donthide="true" name="tokens" a:class="tipelement" a:title="You can create tokens to use when accessing ESME via other clients."/></li>
       } else {
         List()
       }
         
-    val itemPools: NodeSeq = <li><lift:Menu.item donthide="true" name="accessPools" a:class="tipelement" a:title="You can create access pools to restrict access top certain messages."/></li>    
+    val itemPools: NodeSeq = <li><lift:Menu.item donthide="true" name="pools" a:class="tipelement" a:title="You can create access pools to restrict access top certain messages."/></li>    
     
     val itemContacts: NodeSeq = <li><lift:Menu.item donthide="true" name="contacts" a:class="tipelement" a:title="You can manage your followers and those you follow."/></li>     
     
diff --git a/src/main/webapp/action_view/index.html b/src/main/webapp/actions.html
similarity index 100%
rename from src/main/webapp/action_view/index.html
rename to src/main/webapp/actions.html
diff --git a/src/main/webapp/info_view/contacts.html b/src/main/webapp/contacts.html
similarity index 100%
rename from src/main/webapp/info_view/contacts.html
rename to src/main/webapp/contacts.html
diff --git a/src/main/webapp/info_view/conversation.html b/src/main/webapp/conversation.html
similarity index 100%
rename from src/main/webapp/info_view/conversation.html
rename to src/main/webapp/conversation.html
diff --git a/src/main/webapp/pools_view/index.html b/src/main/webapp/pools.html
similarity index 100%
rename from src/main/webapp/pools_view/index.html
rename to src/main/webapp/pools.html
diff --git a/src/main/webapp/profile_view/edit.html b/src/main/webapp/profile.html
similarity index 100%
rename from src/main/webapp/profile_view/edit.html
rename to src/main/webapp/profile.html
diff --git a/src/main/webapp/info_view/public.html b/src/main/webapp/public.html
similarity index 100%
rename from src/main/webapp/info_view/public.html
rename to src/main/webapp/public.html
diff --git a/src/main/webapp/info_view/search.html b/src/main/webapp/search.html
similarity index 100%
rename from src/main/webapp/info_view/search.html
rename to src/main/webapp/search.html
diff --git a/src/main/webapp/info_view/streams.html b/src/main/webapp/streams.html
similarity index 100%
rename from src/main/webapp/info_view/streams.html
rename to src/main/webapp/streams.html
diff --git a/src/main/webapp/info_view/tag.html b/src/main/webapp/tag.html
similarity index 100%
rename from src/main/webapp/info_view/tag.html
rename to src/main/webapp/tag.html
diff --git a/src/main/webapp/templates-hidden/base.html b/src/main/webapp/templates-hidden/base.html
index a108b70..e10aead 100644
--- a/src/main/webapp/templates-hidden/base.html
+++ b/src/main/webapp/templates-hidden/base.html
@@ -56,7 +56,7 @@
                                  <lift:Menu.item donthide="true" name="public" a:class="tipelement" a:title="The public timeline includes messages from all users not only those you are following. "/>  |  
                             </li>
                             <li>
-                              <lift:Menu.item donthide="true" name="list_users" a:class="tipelement" a:title="Users are listed along with their details. "/>  | 
+                              <lift:Menu.item donthide="true" name="users" a:class="tipelement" a:title="Users are listed along with their details. "/>  | 
                             </li>
                              <li>
                                <lift:Menu.item donthide="true" name="streams" a:class="tipelement" a:title="Streams allow you to view pools or the messages sent by particular users. "/>
diff --git a/src/main/webapp/auth_view/index.html b/src/main/webapp/tokens.html
similarity index 100%
rename from src/main/webapp/auth_view/index.html
rename to src/main/webapp/tokens.html
diff --git a/src/main/webapp/track_view/index.html b/src/main/webapp/tracks.html
similarity index 100%
rename from src/main/webapp/track_view/index.html
rename to src/main/webapp/tracks.html
diff --git a/src/main/webapp/info_view/users.html b/src/main/webapp/users.html
similarity index 100%
rename from src/main/webapp/info_view/users.html
rename to src/main/webapp/users.html