diff --git a/t/post.t b/t/post.t
index 7b066c6..6e7b1c5 100644
--- a/t/post.t
+++ b/t/post.t
@@ -70,7 +70,7 @@ $t->post_ok('/post/1')->status_is(200)
->text_like(h2 => qr/New Remark/);
$t->post_ok('/post/1', form => \%valid_remark)->status_is(200)
- ->text_like(h2 => qr/Thread - #1/);
+ ->text_like(h2 => qr/Thread #1/);
$t->post_ok('/post/1', form => \%invalid_remark)->status_is(400)
->text_like(h2 => qr/New Remark/);
diff --git a/t/remark.t b/t/remark.t
index 0f40a6a..40e2708 100644
--- a/t/remark.t
+++ b/t/remark.t
@@ -9,6 +9,6 @@ use Test::Mojo;
my $script = curfile->dirname->sibling('PostText.pl');
my $t = Test::Mojo->new($script);
-$t->get_ok('/remark/1')->status_is(200)->text_like(h2 => qr/Remark - #1/);
+$t->get_ok('/remark/1')->status_is(200)->text_like(h2 => qr/Remark #1/);
done_testing();
diff --git a/t/thread.t b/t/thread.t
index 8af894b..4527d76 100644
--- a/t/thread.t
+++ b/t/thread.t
@@ -9,6 +9,6 @@ use Test::Mojo;
my $script = curfile->dirname->sibling('PostText.pl');
my $t = Test::Mojo->new($script);
-$t->get_ok('/thread/1')->status_is(200)->text_like(h2 => qr/Thread - #1/);
+$t->get_ok('/thread/1')->status_is(200)->text_like(h2 => qr/Thread #1/);
done_testing();
diff --git a/templates/list_page.html.ep b/templates/list_page.html.ep
index 8da123b..2eca410 100644
--- a/templates/list_page.html.ep
+++ b/templates/list_page.html.ep
@@ -5,15 +5,19 @@
<% for my $thread (@{$threads}) { =%>
- <%= link_to "Thread #$thread->{'id'}",
+ <%= link_to "#$thread->{'id'}",
thread_page => {thread_id => $thread->{'id'}} %>
<%= $thread->{'title'} %>
<%= $thread->{'date'} %>
<%= $thread->{'author'} %>
<%= $thread->{'body'} %>
- <%= link_to Remark => thread_id => {thread_id => $thread->{'id'}} %>
-
+
<% } =%>
diff --git a/templates/remark_id.html.ep b/templates/remark_id.html.ep
index 46b3898..a117979 100644
--- a/templates/remark_id.html.ep
+++ b/templates/remark_id.html.ep
@@ -1,12 +1,12 @@
% layout 'main';
-% title "Remark - #$remark->{'id'}";
+% title "Remark #$remark->{'id'}";
<%= title %>