diff --git a/app/Article.php b/app/Article.php
index 3ff391bc..84324892 100644
--- a/app/Article.php
+++ b/app/Article.php
@@ -53,10 +53,10 @@ class Article extends Model
      *
      * @return string
      */
-    public function getMainAttribute($value)
+    public function getHtmlAttribute()
     {
         $markdown = new CommonMarkConverter();
-        $html = $markdown->convertToHtml($value);
+        $html = $markdown->convertToHtml($this->main);
         //change <pre><code>[lang] ~> <pre><code data-language="lang">
         $match = '/<pre><code>\[(.*)\]\n/';
         $replace = '<pre><code class="language-$1">';
diff --git a/resources/views/admin/welcome.blade.php b/resources/views/admin/welcome.blade.php
index d77ca425..72a38221 100644
--- a/resources/views/admin/welcome.blade.php
+++ b/resources/views/admin/welcome.blade.php
@@ -8,7 +8,7 @@ Admin CP
 <h1>Hello {{ $name }}!</h1>
 
 <h2>Articles</h2>
-<p>You can either <a href="/admin/articles/create">create</a> new blog posts, or <a href="/admin/articles/">edit</a> them.<p>
+<p>You can either <a href="/admin/blog/create">create</a> new blog posts, or <a href="/admin/blog/">edit</a> them.<p>
 
 <h2>Notes</h2>
 <p>You can either <a href="/admin/notes/create">create</a> new notes, or <a href="/admin/notes/">edit</a> them.<p>
diff --git a/resources/views/articles/index.blade.php b/resources/views/articles/index.blade.php
index 19b57894..f391345e 100644
--- a/resources/views/articles/index.blade.php
+++ b/resources/views/articles/index.blade.php
@@ -23,7 +23,7 @@ Articles «
             <span class="post-info">Posted <time class="dt-published" title="{{ $article->tooltip_time }}" datetime="{{ $article->w3c_time }}">{{ $article->human_time }}</time> - <a title="Permalink" href="{{ $article->link }}">⚓</a></span>
         </header>
         <div class="e-content">
-            {!! $article['main'] !!}
+            {!! $article->html !!}
         </div>
     </article>
 @endforeach
diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php
index ad39068f..0dea199a 100644
--- a/resources/views/articles/show.blade.php
+++ b/resources/views/articles/show.blade.php
@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-{{ strip_tags($article->title) }} « 
+{{ strip_tags($article->title) }} «
 @stop
 
 @section('content')
@@ -13,7 +13,7 @@
 <span class="post-info">Posted <time class="dt-published" title="{{ $article->tooltip_time }}" datetime="{{ $article->w3c_time }}">{{ $article->human_time }}</time> - <a title="Permalink" href="{{ $article->link }}">⚓</a></span>
 </header>
 <div class="e-content">
-{!! $article->main !!}
+{!! $article->html !!}
 </div>
 </article>
 @stop