diff --git a/config/web.xml b/config/web.xml
index 20bc8f6..7f3b4e6 100644
--- a/config/web.xml
+++ b/config/web.xml
@@ -105,7 +105,7 @@
 	<servlet-class>org.thdl.lex.LogoutServlet</servlet-class>
 	<init-param>
 		<param-name>goodbyePage</param-name>
-		<param-value>/index.jsp</param-value>
+		<param-value>http://iris.lib.virginia.edu/tibet/reference/dictionary.html</param-value>
 	</init-param>
 </servlet>
 
diff --git a/src/jsp/index.jsp b/src/jsp/index.jsp
index 3fe0935..90e64a3 100644
--- a/src/jsp/index.jsp
+++ b/src/jsp/index.jsp
@@ -1,11 +1,12 @@
 <%@ page buffer="12kb" autoFlush="true" import="org.thdl.lex.*" errorPage="/jsp/error.jsp" %>
 <jsp:include page="jsp/header.jsf" />
 
-<div id="label">THDL Tibetan Collaborative Dictionaries Home Page</div><!--END label-->
-<div id="message">Last Updated:October 18, 2003</div><!--END message-->
+<%-- <div id="label">THDL Tibetan Collaborative Dictionaries Home Page</div><!--END label-->
+<div id="message">Last Updated:October 18, 2003</div><!--END message--> --%>
 <div id="columnSingle">
+<h2>Dictionary Welcome Page</h2>
 <p>
-<a href="/lex/action?cmd=menu">Search Dictionary</a>
+<jsp:include page="jsp/navLinks.jsf" />
 </p>
 
 </div><!--END columnSingle-->
diff --git a/src/jsp/jsp/navLinks.jsf b/src/jsp/jsp/navLinks.jsf
index d098c9b..eb12fe5 100644
--- a/src/jsp/jsp/navLinks.jsf
+++ b/src/jsp/jsp/navLinks.jsf
@@ -12,7 +12,7 @@
 </li>
 
 <c:choose>
-<c:when test="${ sessionScope.visit.user.guest }">
+<c:when test="${ sessionScope.visit.user.guest || empty sessionScope.visit }">
 <li>
  | <a href="/lex/login.jsp">Login</a>
 </li>
diff --git a/src/jsp/logout.jsp b/src/jsp/logout.jsp
index 4b7cabe..9f5e221 100644
--- a/src/jsp/logout.jsp
+++ b/src/jsp/logout.jsp
@@ -1,3 +1,5 @@
+<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*" errorPage="/jsp/error.jsp" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%>
 <jsp:include page="jsp/header.jsf" flush="false" />
 
 <div id="columns">
@@ -8,7 +10,7 @@ Log out of THDL Tibetan Collaborative Dictionaries</div>
 <div class="content">
 
 <p>
-Log out account <b><jsp:getProperty name="user" property="username" /></b>
+Log out account <b><c:out value="${ sessionScope.visit.user.username }" /></b>
 </p>
 
 <form action='<%= response.encodeURL( request.getContextPath() + "/logout" )%>' method="post">