diff --git a/everware/spawner.py b/everware/spawner.py
index 2f3547a..73a9688 100755
--- a/everware/spawner.py
+++ b/everware/spawner.py
@@ -30,7 +30,6 @@
 from .email_notificator import EmailNotificator
 from .container_handler import ContainerHandler
 from . import __version__
-from ._spawner_options_form import SPAWNER_OPTIONS_FORM
 
 
 ssl._create_default_https_context = ssl._create_unverified_context
@@ -146,7 +145,29 @@ def load_state(self, state):
         self.user.spawn_pending = False
 
     def _options_form_default(self):
-        return SPAWNER_OPTIONS_FORM
+        return """
+          <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" style="width: 50%">
+            <input
+              id="repository_input"
+              type="text"
+              autocapitalize="off"
+              autocorrect="off"
+              name="repository_url"
+              tabindex="1"
+              autofocus="autofocus"
+              class="mdl-textfield__input"
+            style="margin-bottom: 3px;" />
+            <label class="mdl-textfield__label" for="repository_input">Git repository</label>
+          </div>
+          <label for="need_remove" class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" >
+            <input type="checkbox"
+                   name="need_remove"
+                   class="mdl-checkbox__input"
+                   id="need_remove"
+                   checked />
+            <span class="mdl-checkbox__label">Remove previous container if it exists</span>
+          </label>
+        """
 
     def options_from_form(self, formdata):
         options = {}
diff --git a/everware/_spawner_options_form.py b/share/static/html/_byor_options_form.html
similarity index 98%
rename from everware/_spawner_options_form.py
rename to share/static/html/_byor_options_form.html
index 4ac6b0a..24665be 100644
--- a/everware/_spawner_options_form.py
+++ b/share/static/html/_byor_options_form.html
@@ -1,4 +1,3 @@
-SPAWNER_OPTIONS_FORM = """
 <div style="margin-bottom: 0px;">
 <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" style="width: 50%;">
 <input
@@ -84,4 +83,3 @@
 </div>
 </div>
 </div>
-"""