=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/feedback.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/feedback.vm	2012-01-09 14:29:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/feedback.vm	2012-01-11 09:37:08 +0000
@@ -1,13 +1,12 @@
 
-<h2>$i18n.getString( "write_feedback" )</h2>
-
 <form method="POST" action="sendFeedback.action">
 <div class="header-box" align="center">
 	<h3 style="text-align: left;">$i18n.getString( "send_feedback" )</h3>
     <p style="text-align: left;">
-        $i18n.getString( "subject" )<br />
-        <input type="text" maxlength="255" size="24" name="subject" /> <br />
-        $i18n.getString( "text" )<br />
+        $i18n.getString( "subject" ) *<br />
+        <input type="text" maxlength="255" size="24" name="subject" />
+
+        $i18n.getString( "text" ) *<br />
         <input type="text" maxlength="255" size="24" name="text" />
         <input type="submit" style="width: 100%;" value="$i18n.getString("send")" />
     </p>
@@ -17,7 +16,6 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
-    <li><a href="messages.action">$i18n.getString("messages")</a></li>
     <li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2012-01-09 11:55:36 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2012-01-11 09:37:08 +0000
@@ -12,7 +12,8 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
-	<li><a href="../">$i18n.getString("desktop_version")</a></li>
+    <li><a href="feedback.action">$i18n.getString("feedback")</a></li>
+    <li><a href="../">$i18n.getString("desktop_version")</a></li>
 	<li><a href="../dhis-web-commons-security/logout.action">$i18n.getString("logout")</a></li>
 </ul>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/messages.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/messages.vm	2012-01-09 14:29:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/messages.vm	2012-01-11 09:37:08 +0000
@@ -1,12 +1,4 @@
 
-<h2>$i18n.getString( "feedback" )</h2>
-
-<p>
-<ul>
-    <li><a href="feedback.action">Write feedback</a></li>
-</ul>
-</p>
-
 <h2>$i18n.getString( "conversations" )</h2>
 
 <p>