diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index ede110b5..70720bde 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -23,29 +23,8 @@
%span= time_ago_in_words(a.created_at)
ago
.col-md-6.col-sm-8.col-xs-5.text-right
- %span.hidden-xs.text-muted
- %span{id: "ab-smile-count-#{a.id}"}= a.smile_count
- users smiled this
- - if user_signed_in?
- - if current_user.smiled? a
- %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', 'data-a-id' => a.id, 'data-action' => 'unsmile'}
- %i.fa.fa-frown-o
- - else
- %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', 'data-a-id' => a.id, 'data-action' => 'smile'}
- %i.fa.fa-smile-o
- %a.btn.btn-primary.btn-sm
- %i.fa.fa-comments
- - if privileged? a.user
- %button.btn.btn-danger.btn-sm{name: 'ab-destroy', 'data-a-id' => a.id}
- %i.fa.fa-trash-o
+ = render 'shared/answerbox_buttons', a: a
- else
.row
.col-md-6.col-md-offset-6.col-sm-8.col-sm-offset-4.col-xs-6.col-xs-offset-6.text-right
- %span.hidden-xs.text-muted x users smiled at this
- %a.btn.btn-info.btn-sm
- %i.fa.fa-smile-o
- %a.btn.btn-primary.btn-sm
- %i.fa.fa-comments
- - if privileged? a.user
- %button.btn.btn-danger.btn-sm{name: 'ab-destroy', 'data-a-id' => a.id}
- %i.fa.fa-trash-o
\ No newline at end of file
+ = render 'shared/answerbox_buttons', a: a
\ No newline at end of file
diff --git a/app/views/shared/_answerbox_buttons.html.haml b/app/views/shared/_answerbox_buttons.html.haml
new file mode 100644
index 00000000..6e8cfa0f
--- /dev/null
+++ b/app/views/shared/_answerbox_buttons.html.haml
@@ -0,0 +1,15 @@
+%span.hidden-xs.text-muted
+ %span{id: "ab-smile-count-#{a.id}"}= a.smile_count
+ users smiled this
+- if user_signed_in?
+ - if current_user.smiled? a
+ %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', 'data-a-id' => a.id, 'data-action' => 'unsmile'}
+ %i.fa.fa-frown-o
+ - else
+ %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', 'data-a-id' => a.id, 'data-action' => 'smile'}
+ %i.fa.fa-smile-o
+%a.btn.btn-primary.btn-sm
+ %i.fa.fa-comments
+- if privileged? a.user
+ %button.btn.btn-danger.btn-sm{name: 'ab-destroy', 'data-a-id' => a.id}
+ %i.fa.fa-trash-o
\ No newline at end of file