diff --git a/public/js/controllers/articles.js b/public/js/controllers/articles.js
index 18bece82..66dac1f4 100644
--- a/public/js/controllers/articles.js
+++ b/public/js/controllers/articles.js
@@ -15,13 +15,19 @@ angular.module('mean.articles').controller('ArticlesController', ['$scope', '$ro
     };
 
     $scope.remove = function(article) {
-        article.$remove();  
+        if (article) {
+            article.$remove();  
 
-        for (var i in $scope.articles) {
-            if ($scope.articles[i] == article) {
-                $scope.articles.splice(i, 1);
+            for (var i in $scope.articles) {
+                if ($scope.articles[i] == article) {
+                    $scope.articles.splice(i, 1);
+                }
             }
         }
+        else {
+            $scope.article.$remove();
+            $location.path('articles');
+        }
     };
 
     $scope.update = function() {
diff --git a/public/views/articles/view.html b/public/views/articles/view.html
index 821d0b67..16b76d8b 100644
--- a/public/views/articles/view.html
+++ b/public/views/articles/view.html
@@ -1,6 +1,14 @@
 <section data-ng-controller="ArticlesController" data-ng-init="findOne()">
-	<span>{{article.created | date:'medium'}}</span> /
-	<span>{{article.user.name}}</span>
-	<h2>{{article.title}} <a data-ng-show="global.user._id == article.user._id" href="/#!/articles/{{article._id}}/edit">edit</a></h2>
-	<div>{{article.content}}</div>
-</section>
\ No newline at end of file
+    <span>{{article.created | date:'medium'}}</span>/
+    <span>{{article.user.name}}</span>
+    <h2>{{article.title}}</h2>
+    <div data-ng-show="global.user._id == article.user._id">
+        <a class="btn" href="/#!/articles/{{article._id}}/edit">
+        	<i class="icon-edit"></i>
+        </a> 
+        <a class="btn" data-ng-click="remove();">
+            <i class="icon-trash"></i>
+        </a>
+    </div>
+    <div>{{article.content}}</div>
+</section>