diff --git a/app/views/layouts/static.html.erb b/app/views/layouts/static.html.erb
index a5d7eafb6..025d2355c 100644
--- a/app/views/layouts/static.html.erb
+++ b/app/views/layouts/static.html.erb
@@ -5,7 +5,6 @@
+ <%= inline_react_component 'Icon', icon: 'map-marker' %>
+ <%= user.location %>
+
<% end %>
<% if user.bio? %>
-
+
<%= react_component 'Markdown', content: markdown(user.bio), normalized: true %>
<% end %>
-
<% if user.staff? %>
<%= inline_react_component 'Icon', icon: 'coffee' %>
@@ -28,9 +30,8 @@
<% end %>
-
<% if user.twitter_connected? %>
-
+
<%= inline_react_component 'Icon', icon: 'twitter' %>
<%= user.twitter_nickname %>
@@ -41,9 +42,8 @@
<% end %>
-
<% if user.github_connected? %>
-
+
<%= inline_react_component 'Icon', icon: 'github' %>
<%= @user.github_login %>
@@ -56,12 +56,9 @@
<% if current_user %>
<% if current_user.is_staff? %>
-
- Bitcoin Assets Address
-
-
>
- <%= user.wallet_public_address %>
-
+
+ Bitcoin Assets Address:
+ <%= link_to user.wallet_public_address, user.coinprism_url %>
<% end %>
<% end %>
@@ -69,13 +66,7 @@
-<% if can?(:update, @user) %>
-
-
- Edit Profile
-
-
-<% end %>
+<%= link_to "Edit profile", edit_user_path, class: "btn btn-default btn-block mb2" if can?(:update, @user) %>
<%= react_component 'ProfileProductBadges' %>
diff --git a/app/views/users/_inline.html.erb b/app/views/users/_inline.html.erb
deleted file mode 100644
index 3480cd28f..000000000
--- a/app/views/users/_inline.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= users.collect {|u| link_to("@#{u.username}", user_path(u))}.to_sentence.html_safe %>
\ No newline at end of file
diff --git a/app/views/users/_more_button.html.erb b/app/views/users/_more_button.html.erb
deleted file mode 100644
index c237b967c..000000000
--- a/app/views/users/_more_button.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% unless @stream_events.last_page? %>
-
-<% end %>
diff --git a/app/views/users/avatars/_default.html.erb b/app/views/users/avatars/_default.html.erb
deleted file mode 100644
index 047562f05..000000000
--- a/app/views/users/avatars/_default.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
 %>)
-
- <% if user.sponsored? %>
-
- <% end %>
-
diff --git a/app/views/users/avatars/_sm.html.erb b/app/views/users/avatars/_sm.html.erb
deleted file mode 100644
index b4cbe2113..000000000
--- a/app/views/users/avatars/_sm.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
 %>)
-
- <% if user.sponsored? %>
-
- <% end %>
-
diff --git a/app/views/users/karma.html b/app/views/users/karma.html.erb
similarity index 100%
rename from app/views/users/karma.html
rename to app/views/users/karma.html.erb