Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r660fde180a1b4dbfbe304df8eeef71459aa91f95 -ra7107c71fc43b4d57db90dd624a0787ed65c4ba7
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 660fde180a1b4dbfbe304df8eeef71459aa91f95)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision a7107c71fc43b4d57db90dd624a0787ed65c4ba7)
@@ -24,8 +24,6 @@
 package org.lamsfoundation.lams.web;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -64,6 +62,7 @@
  * @struts:action-forward name="addLesson" path="/addLesson.jsp"
  * @struts:action-forward name="error" path=".error"
  * @struts:action-forward name="passwordChange" path=".passwordChange"
+ * @struts:action-forward name="index" path="/login.jsp"
  *
  */
 public class HomeAction extends DispatchAction {
@@ -228,4 +227,10 @@
 		}
 	}
 	
+	public ActionForward logout(ActionMapping mapping, ActionForm form, 
+			HttpServletRequest req, HttpServletResponse res)
+			throws IOException, ServletException {
+		req.getSession().invalidate();
+		return mapping.findForward("index");
+	}
 }
\ No newline at end of file
Index: lams_central/web/index.jsp
===================================================================
diff -u -r8893d0060139ef4baf9899061d3bee80891862e5 -ra7107c71fc43b4d57db90dd624a0787ed65c4ba7
--- lams_central/web/index.jsp	(.../index.jsp)	(revision 8893d0060139ef4baf9899061d3bee80891862e5)
+++ lams_central/web/index.jsp	(.../index.jsp)	(revision a7107c71fc43b4d57db90dd624a0787ed65c4ba7)
@@ -10,7 +10,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-	<title>LAMS::<fmt:message key="lams.welcome"/></title>
+	<title>LAMS::<fmt:message key="index.welcome"/></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta http-equiv="pragma" content="no-cache">
 	<meta http-equiv="cache-control" content="no-cache">
@@ -87,10 +87,11 @@
 			<table bgcolor="#ffffff" width="100%" height="100%" cellspacing="5" cellpadding="5" align="center">
 				<tr>
 					<td align="left" style="font-size:20pt">
-						<fmt:message key="lams.welcome"/>, <lams:user property="firstName"/> <img src="images/lamb_big.png"/>
+						<fmt:message key="index.welcome"/>, <lams:user property="firstName"/> <img src="images/lamb_big.png"/>
 					</td>
 					<td align="right">
 						<a title="<fmt:message key="index.refresh.hint"/>" href="javascript:getContent()"><fmt:message key="index.refresh"/></a>
+						<a href="home.do?method=logout"><fmt:message key="index.logout"/></a>
 					</td>
 				</tr>
 				<tr>
Index: lams_central/web/indexContent.jsp
===================================================================
diff -u -rb4f45fa67c92ef72d11c0c997cdc3a7ff138c3b6 -ra7107c71fc43b4d57db90dd624a0787ed65c4ba7
--- lams_central/web/indexContent.jsp	(.../indexContent.jsp)	(revision b4f45fa67c92ef72d11c0c997cdc3a7ff138c3b6)
+++ lams_central/web/indexContent.jsp	(.../indexContent.jsp)	(revision a7107c71fc43b4d57db90dd624a0787ed65c4ba7)
@@ -1,12 +1,13 @@
 <%@ page contentType="text/html; charset=utf-8" language="java" %>
 
 <%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <table width=100% border=0>
 	<tr>
 		<td align="right"> 
 			<c:forEach var="headerlink" items="${headerLinks}">
-				[<a href="<c:out value='${headerlink.url}'/>"><c:out value="${headerlink.name}"/></a>]&nbsp;
+				[<a href="<c:out value='${headerlink.url}'/>"><fmt:message key="${headerlink.name}"/></a>]&nbsp;
 			</c:forEach>
 		</td>
 	</tr>
@@ -28,7 +29,7 @@
 								<strong><c:out value="${orgBean.name}"/></strong>
 								<img src="images/spacer.gif" height="10" width="200"/>
 								<c:forEach var="link" items="${orgBean.links}">
-									[<a href="<c:out value='${link.url}'/>"><c:out value="${link.name}"/></a>]&nbsp;
+									[<a href="<c:out value='${link.url}'/>"><fmt:message key="${link.name}"/></a>]&nbsp;
 								</c:forEach>
 								<div>
 									<c:forEach var="lesson" items="${orgBean.lessons}">
@@ -39,7 +40,7 @@
 													<img src="images/tree_white.gif"/> <c:out value="${lesson.name}"/>
 													<img src="images/spacer.gif" height="10" width="200"/>
 													<c:forEach var="lessonlink" items="${lesson.links}">
-														[<a href="<c:out value='${lessonlink.url}'/>"><c:out value="${lessonlink.name}"/></a>]&nbsp;
+														[<a href="<c:out value='${lessonlink.url}'/>"><fmt:message key="${lessonlink.name}"/></a>]&nbsp;
 													</c:forEach>
 													<div></div> 
 												</td>
@@ -62,7 +63,7 @@
 													<strong><c:out value="${childOrg.name}"/></strong>
 													<img src="images/spacer.gif" height="10" width="200"/>
 													<c:forEach var="childlink" items="${childOrg.links}">
-														[<a href="<c:out value='${childlink.url}'/>"><c:out value="${childlink.name}"/></a>]&nbsp;
+														[<a href="<c:out value='${childlink.url}'/>"><fmt:message key="${childlink.name}"/></a>]&nbsp;
 													</c:forEach>
 													<div>
 														<c:forEach var="childLesson" items="${childOrg.lessons}">
@@ -73,7 +74,7 @@
 																		<img src="images/tree_white.gif"/> <c:out value="${childLesson.name}"/>
 																		<img src="images/spacer.gif" height="5" width="200"/>
 																		<c:forEach var="childlessonlink" items="${childLesson.links}">
-																			[<a href="<c:out value='${childlessonlink.url}'/>"><c:out value="${childlessonlink.name}"/></a>]&nbsp;
+																			[<a href="<c:out value='${childlessonlink.url}'/>"><fmt:message key="${childlessonlink.name}"/></a>]&nbsp;
 																		</c:forEach>
 																		<div></div> 
 																	</td>
