diff --git a/app/styles/game-menu/options-view.sass b/app/styles/game-menu/options-view.sass
index b84c149d7..ae9542bff 100644
--- a/app/styles/game-menu/options-view.sass
+++ b/app/styles/game-menu/options-view.sass
@@ -31,6 +31,7 @@
 
     img.profile-photo
       width: 100%
+      border-radius: 6px
 
       &.saving
         opacity: 0.5
diff --git a/app/templates/game-menu/choose-hero-view.jade b/app/templates/game-menu/choose-hero-view.jade
index 09a3e4e89..c2d7fd5c7 100644
--- a/app/templates/game-menu/choose-hero-view.jade
+++ b/app/templates/game-menu/choose-hero-view.jade
@@ -1,3 +1,10 @@
+h3(data-i18n="play_level.reload_title") Reload All Code?
+  
+p(data-i18n="play_level.reload_really") Are you sure you want to reload this level back to the beginning?
+  
+p
+  a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="play_level.reload_confirm").btn.btn-primary#restart-level-confirm-button Reload All
+
 img(src="/images/pages/game-menu/choose-hero-stub.png")
 
 div(data-i18n="choose_hero.temp") Temp
diff --git a/app/templates/play/level/control_bar.jade b/app/templates/play/level/control_bar.jade
index 8c7b15f03..745a16411 100644
--- a/app/templates/play/level/control_bar.jade
+++ b/app/templates/play/level/control_bar.jade
@@ -13,6 +13,4 @@ button.btn.btn-xs.btn-success.banner#docs-button(title="Show level instructions"
 if spectateGame
   button.btn.btn-xs.btn-inverse.banner#next-game-button(title="Next Game", data-i18n="play_level.next-game") Next game!
 
-button.btn.btn-xs.btn-inverse.banner#restart-button(title="Reload all custom code to reset level", data-i18n="play_level.restart") Restart
-
 button.btn.btn-xs.btn-primary.banner#level-done-button(data-i18n="play_level.done") Done
diff --git a/app/templates/play/level/modal/reload.jade b/app/templates/play/level/modal/reload.jade
deleted file mode 100644
index 50f429594..000000000
--- a/app/templates/play/level/modal/reload.jade
+++ /dev/null
@@ -1,11 +0,0 @@
-extends /templates/modal/modal_base
-
-block modal-header-content
-  h3(data-i18n="play_level.reload_title") Reload All Code?
-  
-block modal-body-content
-  p(data-i18n="play_level.reload_really") Are you sure you want to reload this level back to the beginning?
-  
-block modal-footer-content
-  a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="modal.close").btn Close
-  a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="play_level.reload_confirm").btn.btn-primary#restart-level-confirm-button Reload All
diff --git a/app/views/game-menu/ChooseHeroView.coffee b/app/views/game-menu/ChooseHeroView.coffee
index 32140aa69..7699be471 100644
--- a/app/views/game-menu/ChooseHeroView.coffee
+++ b/app/views/game-menu/ChooseHeroView.coffee
@@ -8,6 +8,9 @@ module.exports = class ChooseHeroView extends CocoView
   className: 'tab-pane'
   template: template
 
+  events:
+    'click #restart-level-confirm-button': -> Backbone.Mediator.publish 'restart-level'
+
   getRenderData: (context={}) ->
     context = super(context)
     context
diff --git a/app/views/play/level/ControlBarView.coffee b/app/views/play/level/ControlBarView.coffee
index 72549ca7c..974e61c06 100644
--- a/app/views/play/level/ControlBarView.coffee
+++ b/app/views/play/level/ControlBarView.coffee
@@ -2,7 +2,6 @@ CocoView = require 'views/kinds/CocoView'
 template = require 'templates/play/level/control_bar'
 
 LevelGuideModal = require './modal/LevelGuideModal'
-ReloadLevelModal = require './modal/ReloadLevelModal'
 GameMenuModal = require 'views/game-menu/GameMenuModal'
 
 module.exports = class ControlBarView extends CocoView
@@ -17,10 +16,6 @@ module.exports = class ControlBarView extends CocoView
       window.tracker?.trackEvent 'Clicked Docs', level: @level.get('name'), label: @level.get('name')
       @showGuideModal()
 
-    'click #restart-button': ->
-      window.tracker?.trackEvent 'Clicked Restart', level: @level.get('name'), label: @level.get('name')
-      @showRestartModal()
-
     'click #next-game-button': ->
       Backbone.Mediator.publish 'next-game-pressed'
 
@@ -79,8 +74,5 @@ module.exports = class ControlBarView extends CocoView
     clearInterval @guideHighlightInterval
     @guideHighlightInterval = null
 
-  showRestartModal: ->
-    @openModalView(new ReloadLevelModal())
-
   showGameMenuModal: ->
     @openModalView new GameMenuModal level: @level, session: @session, playableTeams: @playableTeams
diff --git a/app/views/play/level/modal/ReloadLevelModal.coffee b/app/views/play/level/modal/ReloadLevelModal.coffee
deleted file mode 100644
index cd3700325..000000000
--- a/app/views/play/level/modal/ReloadLevelModal.coffee
+++ /dev/null
@@ -1,11 +0,0 @@
-ModalView = require 'views/kinds/ModalView'
-template = require 'templates/play/level/modal/reload'
-
-# let's implement this once we have the docs database schema set up
-
-module.exports = class ReloadLevelModal extends ModalView
-  id: '#reload-code-modal'
-  template: template
-
-  events:
-    'click #restart-level-confirm-button': -> Backbone.Mediator.publish 'restart-level'