diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index a38f6fd050..5ab72fdaa5 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -228,4 +228,3 @@ block content
                                 input(type='hidden', name='_csrf', value=_csrf)
                                 button.btn.btn-danger.btn-block(type='submit')
                                     | I am 100% sure I want to delete my account and all of my progress
->>>>>>> refactor map view and make buttons and text bigger
diff --git a/server/views/challenges/showStep.jade b/server/views/challenges/showStep.jade
index fbbd614dc1..e98b378109 100644
--- a/server/views/challenges/showStep.jade
+++ b/server/views/challenges/showStep.jade
@@ -7,8 +7,10 @@ block content
                         a(href=step[0] data-lightbox='img-enlarge')
                             img.gif-block.img-center.img-responsive(src='#{step[0]}' alt='#{step[1]}')
                         .row
+                            .spacer
                             .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2
                                 p!= step[2]
+                        .spacer
                         .challenge-button-block
                             if step[3]
                                 a.btn.btn-block.btn-primary.challenge-step-btn-action.btn-lg(id='#{index}' href='#{step[3]}' target='_blank') Open link in new tab (this unlocks the next step)