Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -r559dc8a134ed70af69734155669ead622634783e -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision 559dc8a134ed70af69734155669ead622634783e)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -95,7 +95,7 @@
 	margin-right: 30px;
 }
 
-li { list-style-type:square;}
+li { list-style-type:circle;}
 
 /*layout of the table with the alternate color for the table heading cell */
 table.alternative-color {
@@ -304,6 +304,12 @@
 	height:20px;}
 
 
+.float-left {float:left;}
+
+.float-right {float:right;}
+
+
+
 /*
 *************************************************
 
Index: lams_central/web/css/defaultHTML_rtl.css
===================================================================
diff -u -r559dc8a134ed70af69734155669ead622634783e -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_central/web/css/defaultHTML_rtl.css	(.../defaultHTML_rtl.css)	(revision 559dc8a134ed70af69734155669ead622634783e)
+++ lams_central/web/css/defaultHTML_rtl.css	(.../defaultHTML_rtl.css)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -508,71 +508,71 @@
 /*layout of the table with the alternate color for the table heading cell */
 table.alternative-color {
  	 width:91%; 
-	 margin-left:17px; 
+	 margin-right:17px; 
 	 padding-top:0px; 
 	 margin-bottom:15px; 
-	 text-align:left;
+	 text-align:right;
 }
 
 table.alternative-color th {
 	background: url('../images/css/green_bg.jpg') repeat-x;
 	height: 30px;
 	color: #47bc23;
-	padding-left: 15px;
-	border-left: 1px solid #cacdd1;
-	border-right: 1px solid #fff;
+	padding-right: 15px;
+	border-right: 1px solid #cacdd1;
+	border-left: 1px solid #fff;
 	font-size: 12px;
 }
 
 table.alternative-color td {
-	padding-left: 20px;
+	padding-right: 20px;
 	font-size: 11px;
 	border-bottom: 1px solid #efefef;
 	vertical-align: top; 
 	background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 0px
 }
 
 table.alternative-color td.first, table.alternative-color th.first {
-	border-left: none;
-	padding-left: 20px;
+	border-right: none;
+	padding-right: 20px;
 }
 
 
 /*layout of the forum tables with the colored table heading cell */
 table.forum { 
 	width:93%;
-	margin-left:20px; 
+	margin-right:20px; 
 	padding-top:5px; 
 	margin-bottom:10px;
 	background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 49px; 
-	text-align:left; 
+	text-align:right; 
 	border-bottom:1px solid #efefef;}
 
 table.forum th { 
 	background: url('../images/css/green_bg_forum.jpg') repeat-x #f0f5df; 
 	height:20px; 
 	padding-top:5px; 
 	color:#47bc23; 
-	padding-left:15px; 
-	border-left:1px solid #cacdd1;  
+	padding-right:15px; 
+	border-right:1px solid #cacdd1;  
 	font-size:12px; 
 	vertical-align:middle;
 }
 
 table.forum td.posted-by {
 	background: url('../images/css/forum_postedby_bg.jpg') repeat-x; 
 	height:20px; 
-	padding-left:15px; 
+	padding-right:15px; 
 	padding-top:0px; 
 	font-size:10px;
 	vertical-align:top; 
-	border-left:1px solid #cacdd1; 
+	border-right:1px solid #cacdd1; 
 	color:#666;
 }
 
 
 table.forum td {
-	padding-left:20px; 
+	padding-right:20px; 
 	font-size:11px; 
 	vertical-align:top; 
 }
Index: lams_central/web/css/defaultHTML_rtl_learner.css
===================================================================
diff -u -r559dc8a134ed70af69734155669ead622634783e -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_central/web/css/defaultHTML_rtl_learner.css	(.../defaultHTML_rtl_learner.css)	(revision 559dc8a134ed70af69734155669ead622634783e)
+++ lams_central/web/css/defaultHTML_rtl_learner.css	(.../defaultHTML_rtl_learner.css)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -95,7 +95,7 @@
 	margin-left: 30px;
 }
 
-li { list-style-type:square;}
+li { list-style-type:circle;}
 
 /*layout of the table with the alternate color for the table heading cell */
 table.alternative-color {
@@ -304,6 +304,11 @@
 	height:20px;}
 
 
+.float-left {float:right;}
+
+.float-right {float:left;}
+
+
 /*
 *************************************************
 
Index: lams_tool_chat/web/error.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_chat/web/error.jsp	(.../error.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/error.jsp	(.../error.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -1,10 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
 	"http://www.w3.org/TR/html4/strict.dtd">
-<html>
+
 <%@ page language="java" isErrorPage="true" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<lams:html>
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
@@ -66,4 +67,4 @@
 
 </script>
 </body>
-</html>
+</lams:html>
Index: lams_tool_chat/web/layouts/defaultLayout.jsp
===================================================================
diff -u -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision f393908c737e5401dda3b995bacb6e4c4a5e5a50)
+++ lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<html>
+<lams:html>
 	<tiles:insert attribute="header" />
 	<body class="stripes">
 
@@ -18,4 +18,4 @@
 			<div id="footer"></div>
 
 	</body>
-</html>
+</lams:html>
Index: lams_tool_chat/web/layouts/learningLayout.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_chat/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -3,11 +3,11 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<html>
+<lams:html>
 	<tiles:insert attribute="header" />
 	<body class="stripes">
 			
 				<tiles:insert attribute="body" />
 			
 	</body>
-</html>
+</lams:html>
Index: lams_tool_chat/web/layouts/tabLayout.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<html>
+<lams:html>
 	<tiles:insert attribute="header" />
 	<body class="stripes" onload="init();">
 		<div id="page">
@@ -15,4 +15,4 @@
 			<tiles:insert attribute="body" />
 		</div>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_chat/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_chat/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -3,7 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<html>
+<lams:html>
 	<head>
 		<title><c:out value="${chatDTO.title}" escapeXml="false" /></title>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -82,4 +82,4 @@
 			<!--closes footer-->
 
 	</body>
-</html>
+</lams:html>
Index: lams_tool_chat/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r3605a487dbf22d097f03ab539f1f4df98bdc2f49 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 3605a487dbf22d097f03ab539f1f4df98bdc2f49)
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -14,7 +14,7 @@
 
 <html:form action="/learning" method="post">
 	<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
-	<div align="right" class="space-bottom-top">
+	<div class="space-bottom-top align-right">
 		<c:choose>
 			<c:when
 				test="${!chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
Index: lams_tool_chat/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision f393908c737e5401dda3b995bacb6e4c4a5e5a50)
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -113,8 +113,7 @@
 		<tr>
 			<td colspan="3">
 				<div>
-					<html:form action="/monitoring" method="get" target="_blank"
-						style="float:left; margin-right: 4px">
+					<html:form action="/monitoring" method="get" target="_blank">
 						<div>
 							<html:hidden property="dispatch" value="openChatHistory" />
 							<html:hidden property="toolSessionID"
Index: lams_tool_forum/web/error.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/error.jsp	(.../error.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/web/error.jsp	(.../error.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -1,10 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
 	"http://www.w3.org/TR/html4/strict.dtd">
-<html>
+
 <%@ page language="java" isErrorPage="true" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<lams:html>
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
@@ -66,4 +67,4 @@
 
 </script>
 </body>
-</html>
+</lams:html>
Index: lams_tool_forum/web/includes/layout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -4,7 +4,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
-<html>
+<lams:html>
 	<head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
@@ -27,4 +27,4 @@
 			</div>
 
 	</body>
-</html>
+</lams:html>
Index: lams_tool_forum/web/includes/learnerLayout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_forum/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -9,7 +9,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
-<html>
+<lams:html>
 	<head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
@@ -28,4 +28,4 @@
 	<body class="stripes">
 			<tiles:insert attribute="body" />
 	</body>
-</html>
+</lams:html>
Index: lams_tool_forum/web/includes/tablayout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_forum/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -4,7 +4,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
-<html>
+<lams:html>
 	<head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/tabbedheader.jsp"%>
@@ -28,4 +28,4 @@
 			<div id="footer"></div>
 		</div>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -rc1a6ead2bc36d08457425380d19bed20e76fbcd2 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision c1a6ead2bc36d08457425380d19bed20e76fbcd2)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
-<html>
+<lams:html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
@@ -59,4 +59,4 @@
 
 		</html:form>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -rc1a6ead2bc36d08457425380d19bed20e76fbcd2 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision c1a6ead2bc36d08457425380d19bed20e76fbcd2)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
-<html>
+<lams:html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
@@ -73,4 +73,4 @@
 			</div>
 		</html:form>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp	(.../forbiddenedit.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp	(.../forbiddenedit.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -3,7 +3,7 @@
 
 
 <%@ include file="/common/taglibs.jsp"%>
-<html>
+<lams:html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
 	</head>
@@ -20,4 +20,4 @@
 		</table>
 
 	</body>
-</html>
+</lams:html>
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -r9b002f2ef9622138a70c602988697b33f1bb2615 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 9b002f2ef9622138a70c602988697b33f1bb2615)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -15,7 +15,7 @@
 				<td>
 					
 					<c:if test="${topic.hasAttachment}">
-						<img src="<html:rewrite page="/images/paperclip.gif" />" align="right" class="space-right" >
+						<img src="<html:rewrite page="/images/paperclip.gif" />" class="space-right float-right">
 					</c:if>
 					
 					<c:set var="viewtopic">
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -re94ab9297f8c77e5e3ce281b4ca49719c1cde5e2 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision e94ab9297f8c77e5e3ce281b4ca49719c1cde5e2)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
-<html>
+<lams:html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
@@ -80,5 +80,5 @@
 		</table>
 
 	</body>
-</html>
+</lams:html>
 
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
diff -u -rb73ea10c36c8939d404f95b6e39cbcb4efbd64ba -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision b73ea10c36c8939d404f95b6e39cbcb4efbd64ba)
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -8,7 +8,7 @@
 <c:set var="mode" value="${sessionMap.mode}"/>
 <c:set var="title" value="${sessionMap.title}"/>
 
-<html:html locale="true">
+<lams:html>
 
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -126,4 +126,4 @@
 
 
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_forum/web/jsps/learning/message/msgattachment.jsp
===================================================================
diff -u -reb9c343e0a5d441b32fc35cb034a621525ead82d -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/learning/message/msgattachment.jsp	(.../msgattachment.jsp)	(revision eb9c343e0a5d441b32fc35cb034a621525ead82d)
+++ lams_tool_forum/web/jsps/learning/message/msgattachment.jsp	(.../msgattachment.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -3,7 +3,7 @@
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 <input type="hidden" name="hasAttachment" value="${topic.hasAttachment}"/>
 <c:if test="${topic.hasAttachment}">
-<table border="0" style="align:left;width:400px">
+<table border="0" class="align-left" style="width:400px">
 	<c:forEach var="file" items="${topic.message.attachments}">
 		<tr><td>
 		<c:set var="downloadURL">
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -r53645c8d07fa71f2f23a362667a1bfc270bb4912 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -19,15 +19,16 @@
 		<c:forEach items="${topicList}" var="topic">
 			<tr>
 				<td>
+					<c:if test="${topic.hasAttachment}">
+						<img src="<html:rewrite page="/images/paperclip.gif"/>" class="space-right float-right">
+					</c:if>
+					
 					<c:set var="viewtopic">
 						<html:rewrite page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${topic.message.uid}&create=${topic.message.created.time}" />
 					</c:set>
 					<html:link href="${viewtopic}">
 						<c:out value="${topic.message.subject}" />
 					</html:link>
-					<c:if test="${topic.hasAttachment}">
-						<img src="<html:rewrite page="/images/paperclip.gif"/>">
-					</c:if>
 				</td>
 				<td>
 					<c:set var="author" value="${topic.author}"/>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r1c995cd6d87591d824ddde103a6138f2632e8f71 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -48,20 +48,24 @@
 			<c:if test="${not empty msgDto.message.attachments}">
 				<tr>
 					<td>
+						<ul>
 						<c:if
 							test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
 							<c:forEach var="file" items="${msgDto.message.attachments}">
+								<li>
 								<c:set var="downloadURL">
 									<html:rewrite
 										page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 								</c:set>
 								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
 									<c:out value="${file.fileName}" /> </a>
+								</li>
 							</c:forEach>
 						</c:if>
 						<c:if test='${hidden}'>
 							<fmt:message key="topic.message.attachment.hidden" />
 						</c:if>
+						<ul>
 					</td>
 				</tr>
 			</c:if>
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u -rf83f1a2a9c95280c7c0f060aad379a345d44f928 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision f83f1a2a9c95280c7c0f060aad379a345d44f928)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -21,7 +21,7 @@
 
 		<html:textarea cols="52" rows="6" property="entryText" styleClass="text-area" />
 
-		<div align="right" class="space-bottom-top">
+		<div class="space-bottom-top align-right">
 			<html:submit styleClass="button">
 				<fmt:message key="label.finish" />
 			</html:submit>
Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -11,7 +11,7 @@
 		<fmt:message key="run.offline.message" />
 	</p>
 
-	<div align="right" class="space-bottom-top">
+	<div class="space-bottom-top align-right">
 		<c:set var="continue">
 			<html:rewrite
 				page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -r53645c8d07fa71f2f23a362667a1bfc270bb4912 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -40,7 +40,7 @@
 
 
 
-			<div style="float:right">
+			<div class="right-buttons">
 				<c:if test='${sessionMap.mode != "teacher"}'>
 					<c:choose>
 						<c:when
Index: lams_tool_forum/web/jsps/monitoring/message/viewtopic.jsp
===================================================================
diff -u -r2700025047410d38f40b3bd7c56966a9fc08bb29 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_forum/web/jsps/monitoring/message/viewtopic.jsp	(.../viewtopic.jsp)	(revision 2700025047410d38f40b3bd7c56966a9fc08bb29)
+++ lams_tool_forum/web/jsps/monitoring/message/viewtopic.jsp	(.../viewtopic.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -31,7 +31,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td align="right">
+			<td class="align-right">
 				<c:forEach var="file" items="${topic.message.attachments}">
 					<c:set var="downloadURL">
 						<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -rb7cac8e45e4690799d10c598c033184e8ab056f6 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision b7cac8e45e4690799d10c598c033184e8ab056f6)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -10,7 +10,7 @@
 	</p>
 
 	<c:if test="${!NbLearnerForm.readOnly}">
-		<div align="right" class="space-bottom-top"><html:form
+		<div class="space-bottom-top align-right"><html:form
 			action="/learner" target="_self">
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="mode" />
Index: lams_tool_nb/web/monitoring/m_EditActivity.jsp
===================================================================
diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision eac1a7689dc88e224668832952fc27c8b732a8a9)
+++ lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -34,7 +34,7 @@
 </table>
 
 <c:if test='${formBean.contentEditable == "true"}'>
-	<p align="right">
+	<p class="align-right">
 		<html:link forward="forwardToAuthorPage" name="NbMonitoringForm" property="parametersToAppend" styleClass="button" target="_blank">
 			<fmt:message key="button.edit" />
 		</html:link>
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r6a8b3b4d658228ef8358b4c59f7a68f27e60f94d -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 6a8b3b4d658228ef8358b4c59f7a68f27e60f94d)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -39,12 +39,10 @@
 				</c:otherwise>
 			</c:choose>
 
-			<div class="space-bottom-top">
-				<p class="align-right">
+			<div class="space-bottom-top align-right">
 					<html:submit styleClass="button">
 						<fmt:message>button.finish</fmt:message>
 					</html:submit>
-				</p>
 			</div>
 		</html:form>
 	</c:if>
Index: lams_tool_notebook/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24 -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d
--- lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24)
+++ lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
@@ -10,9 +10,9 @@
 	</lams:Tabs>
 </div>
 
-<lams:help toolSignature="<%= NotebookConstants.TOOL_SIGNATURE %>" module="monitoring"/>
-
 <div id="content">
+	<lams:help toolSignature="<%= NotebookConstants.TOOL_SIGNATURE %>" module="monitoring"/>
+
 	<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
 	<lams:TabBody id="2" titleKey="button.instructions" page="instructions.jsp" />
 	<lams:TabBody id="3" titleKey="button.editActivity" page="editActivity.jsp" />