diff --git a/Gemfile b/Gemfile
index 075d16529..18cde6c01 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem 'flag_shih_tzu'
 gem 'font-awesome-rails'
 gem 'geocoder'
 gem 'github_api'
-gem 'haml', '~> 4.0.7' # 5.0.x has formatting issues caused by removal of the :ugly option https://git.io/v5i0G
+gem 'haml'
 gem 'highline'
 gem 'html_truncator'
 gem 'httparty'
diff --git a/Gemfile.lock b/Gemfile.lock
index cf7481a01..429b39607 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -142,7 +142,7 @@ GEM
       activemodel-serializers-xml (~> 1.0)
       activesupport (~> 5.0)
       request_store (~> 1.0)
-    erubi (1.6.1)
+    erubi (1.7.0)
     erubis (2.7.0)
     eventmachine (1.2.5)
     execjs (2.7.0)
@@ -189,7 +189,8 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    haml (4.0.7)
+    haml (5.0.3)
+      temple (>= 0.8.0)
       tilt
     hashdiff (0.3.6)
     hashie (3.5.6)
@@ -392,6 +393,7 @@ GEM
     strong_password (0.0.5)
     sucker_punch (2.0.3)
       concurrent-ruby (~> 1.0.0)
+    temple (0.8.0)
     terminal-notifier (1.8.0)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
@@ -461,7 +463,7 @@ DEPENDENCIES
   geocoder
   github_api
   guard-rspec
-  haml (~> 4.0.7)
+  haml
   highline
   html_truncator
   httparty
diff --git a/app/assets/stylesheets/app/buttons.scss b/app/assets/stylesheets/app/buttons.scss
index ccc17c814..3501f25ec 100644
--- a/app/assets/stylesheets/app/buttons.scss
+++ b/app/assets/stylesheets/app/buttons.scss
@@ -28,10 +28,14 @@
   }
 }
 
+.btn {
+  margin-right: 5px;
+}
+
 h1 .btn {
   margin-top: -3px;
 }
 
 .clickable {
   cursor: pointer;
-}
\ No newline at end of file
+}