diff --git a/src/Service/SnipService.php b/src/Service/SnipService.php
index f19f39f..9250d09 100644
--- a/src/Service/SnipService.php
+++ b/src/Service/SnipService.php
@@ -19,7 +19,6 @@ class SnipService
     {
         $git = new Git();
         $repoPath = sprintf('%s/%s', $snipBasePath, $snip->getId());
-        dump($repoPath, $snip);
         if (!is_dir($repoPath)) {
             $this->repo = $git->init($repoPath);
         } else {
@@ -39,7 +38,6 @@ class SnipService
 
     public function update(string $snipContents): void
     {
-        dump($this->getSnipPath());
         file_put_contents($this->getSnipPath(), $snipContents);
         $this->repo->addFile('snip.txt');
         if ($this->repo->hasChanges()) {
diff --git a/templates/security/register.html.twig b/templates/security/register.html.twig
index 0036da8..002321e 100644
--- a/templates/security/register.html.twig
+++ b/templates/security/register.html.twig
@@ -1,5 +1,7 @@
 {% extends 'base/base.html.twig' %}
 
+{% block title %}Register{% endblock %}
+
 {% block body %}
     <h1 class="h3 mb-3 font-weight-normal">Register new user</h1>
     {{ form(registrationForm) }}
diff --git a/templates/snip/edit.html.twig b/templates/snip/edit.html.twig
index b8990aa..690b0ff 100644
--- a/templates/snip/edit.html.twig
+++ b/templates/snip/edit.html.twig
@@ -1,6 +1,18 @@
 {% extends 'base/base.html.twig' %}
 
+{% block title %}Edit {{ snip }}{% endblock %}
+
 {% block body %}
+    {% if snip.id %}
+        <a href="{{ path('snip_single', {snip: snip.id}) }}" class="btn btn-primary">
+            <i class="fa fa-arrow-left"></i>
+            Back
+        </a>
+    {% endif %}
+    <a href="{{ path('snip_index') }}" class="btn btn-info">
+        <i class="fa fa-list"></i>
+        Index
+    </a><br><br>
     <h2>Editing {{ snip }}</h2>
     {{ form(form) }}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/snip/index.html.twig b/templates/snip/index.html.twig
index 0a6d7dd..297c9e2 100644
--- a/templates/snip/index.html.twig
+++ b/templates/snip/index.html.twig
@@ -1,8 +1,12 @@
 {% extends 'base/base.html.twig' %}
 
+{% block title %}My snippets{% endblock %}
+
 {% block body %}
-    <h1>Snippets</h1>
-    <a class="btn btn-primary" href="{{ path('snip_new') }}">Create a new Snip</a>
+    <h1>My snippets</h1>
+    <a class="btn btn-success" href="{{ path('snip_new') }}">
+        <i class="fa fa-plus"></i> Add
+    </a><br><br>
     <div class="list-group">
         {% for snip in snips %}
             <a class="list-group-item" href="{{ path('snip_single', {snip: snip.id}) }}">
diff --git a/templates/snip/single.html.twig b/templates/snip/single.html.twig
index be69858..b843e77 100644
--- a/templates/snip/single.html.twig
+++ b/templates/snip/single.html.twig
@@ -1,18 +1,27 @@
 {% extends 'base/base.html.twig' %}
 
+{% block title %}Snip {{ snip }}{% endblock %}
+
 {% block body %}
+    <a href="{{ path('snip_index') }}" class="btn btn-primary">
+        <i class="fa fa-arrow-left"></i> Back
+    </a>
+    {% if is_granted('edit', snip) %}
+        <a class="btn btn-warning" href="{{ path('snip_edit', {snip: snip.id}) }}">
+            <i class="fa fa-pencil" aria-hidden="true"></i> Edit
+        </a>
+    {% endif %}
+    <a href="{{ path('snip_raw', {snip: snip.id}) }}" class="btn btn-danger">
+        <i class="fa fa-eye"></i> Raw
+    </a>
+    <br><br>
     <div class="card" style="width: 100%;">
         <h4 class="card-header">
-            {% if is_granted('edit', snip) %}
-                <a class="btn btn-sm btn-outline-info" href="{{ path('snip_edit', {snip: snip.id}) }}">
-                    <i class="fa fa-pencil" aria-hidden="true"></i>
-                </a>
-            {% endif %}
             {{ include('snip/badge.html.twig', {snip: snip}) }}
             {{ snip }}
         </h4>
         <div class="card-body">
-            <p class="card-text">{{ content }}</p>
+            <p class="card-text">{{ content|nl2br }}</p>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file