diff --git a/templates/main/form.html.ep b/templates/main/form.html.ep
new file mode 100644
index 0000000..8804ee6
--- /dev/null
+++ b/templates/main/form.html.ep
@@ -0,0 +1,14 @@
+<div id="cmtd_add">
+  <form method="POST" action="">
+  <div class="cmtd_head">
+    <%= l('Name') %>: <%= text_field 'name', required => 1, placeholder => l('Name') %>
+    <input type="hidden" name="reply" value="">
+  </div>
+  <textarea name="text" required=1></textarea>
+  <div id="cmtd_captcha"></div>
+  <div class="cmtd_add">
+    <%= submit_button l('Send') %>
+    <span id="resp"></span>
+  </div>
+  </form>
+</div>
diff --git a/templates/main/list.html.ep b/templates/main/list.html.ep
index a060290..3ff28ad 100644
--- a/templates/main/list.html.ep
+++ b/templates/main/list.html.ep
@@ -1,14 +1,23 @@
 % my $comments = stash('comments') || [];
 <div id="cmtd_main">
-% foreach my $cm (@{ $comments }) {
-  <div id="cmtd_comment">
+<hr>
+<%= tag 'h4' => l('Comments') . ':' %>
+% if (@{ $comments }) {
+%   foreach my $cm (@{ $comments }) {
+  <div class="cmtd_comment">
     <div class="cmtd_head">
-      <%= tag span => (class => 'cmtd_num')  => $cm->{seq}  %>,
+      <%= tag a    => (class => 'cmtd_num', name => "cm$cm->{seq}")  => "# $cm->{seq}" %>,
       <%= tag span => (class => 'cmtd_name') => $cm->{name} %>,
       <%= tag span => (class => 'cmtd_date') => $cm->{date} %>,
-      <%= link_to 'Reply' => '#', class => 'reply', 'date-id' => $cm->{seq} %>
+      <%= link_to l('Reply') => '#', class => 'c_add', 'data-cid' => $cm->{seq} %>
     </div>
     <%= tag 'div'  => (class => 'cmtd_text') => $cm->{text} %>
   </div>
+%   }
+  <span id="comment_add"><%= link_to l('Add') => '#', class => 'c_add' %></span>
+% } else {
+  <p id="no_comments_notice">
+    <%= l('No comments') %>. <%= link_to l('Add') => '#', class => 'c_add' %>?
+  </p>
 % }
 </div>