diff --git a/app/assets/javascripts/forms.js b/app/assets/javascripts/forms.js
index 8ff14ee..ccfa4be 100644
--- a/app/assets/javascripts/forms.js
+++ b/app/assets/javascripts/forms.js
@@ -1,9 +1,21 @@
 $(document).ready(function() {
-  
+
+  $( "#show_display_info" ).click(function() {
+    $( ".display_info" ).toggle();
+  });
+
+  $( "#show_web" ).click(function() {
+    $( ".web" ).toggle();
+  });
+
+  $( "#show_add_subtitles" ).click(function() {
+    $( ".add_subtitles" ).toggle();
+  });
+
   $('#generate').click(function(){
     $('#command_line').val("ffmpeg" + 
       " -i " + $('#input_name').val() + 
-      " -o " + $('#output_name').val())
+      " " + $('#output_name').val())
   });
 
   $('#display_generate').click(function(){
@@ -11,4 +23,16 @@ $(document).ready(function() {
       " -i " + $('#input_name').val())
   });
 
+  $('#web_generate').click(function(){
+    $('#web_command_line').val("ffmpeg" + 
+      " -i " + $('#input_name').val())
+  });
+
+  $('#add_subtitles_generate').click(function(){
+    $('#command_line').val("ffmpeg" + 
+      " -i " + $('#input_name').val() + 
+      " " + $('#output_name').val())
+  });
+
+
 });
\ No newline at end of file
diff --git a/app/views/forms/_add_subtitles.html.erb b/app/views/forms/_add_subtitles.html.erb
new file mode 100644
index 0000000..bd919f2
--- /dev/null
+++ b/app/views/forms/_add_subtitles.html.erb
@@ -0,0 +1,38 @@
+      <div id="file_names">
+        <div class="well">
+        <fieldset>
+          <legend>Input</legend>
+            <div class="form-group">
+            <label class="control-label" for="input_name">Input</label>
+              <div class="controls">
+              <input type="text" name="input_name" id="input_name" placeholder="input" />
+              </div>
+            </div>
+          <br/>
+        </fieldset>
+        </div>
+      </div>
+
+      <div class="well">
+      <fieldset>
+        <legend>Output</legend>
+          <div class="form-group">
+          <label class="control-label" for="output_name">Output</label>
+            <div class="controls">
+            <output type="text" name="output_name" id="output_name" placeholder="output" />
+            </div>
+          </div>
+        <br/>
+        <input type="button" class="btn btn-large btn-primary" name="display_generate" id="add_subtitles_generate" value="Generate" />
+      </fieldset>
+      </div>
+
+      <div class="well">
+        <fieldset>
+          <legend>Your command line:</legend>
+          <textarea name="command_line" id="command_line" rows="3" cols="100"></textarea>
+        </fieldset>
+      </div>
+
+
+    </div> <!-- container -->
\ No newline at end of file
diff --git a/app/views/forms/_web.html.erb b/app/views/forms/_web.html.erb
index df3d316..9d44936 100644
--- a/app/views/forms/_web.html.erb
+++ b/app/views/forms/_web.html.erb
@@ -1,4 +1,5 @@
       <div id="file_names">
+        
         <div class="well">
         <fieldset>
           <legend>Input and Output</legend>
@@ -15,7 +16,7 @@
               </div>
             </div>
           <br/>
-          <input type="button" class="btn btn-large btn-primary" name="generate" id="generate" value="Generate" />
+          <input type="button" class="btn btn-large btn-primary" name="generate" id="web_generate" value="Generate" />
         </fieldset>
         </div>
       </div>
diff --git a/app/views/forms/index.html.erb b/app/views/forms/index.html.erb
index fba89e7..6436624 100644
--- a/app/views/forms/index.html.erb
+++ b/app/views/forms/index.html.erb
@@ -11,8 +11,12 @@
             <li>
               <div id="show_display_info">Display info</div>
             </li>
-            <li>Export for web</li>
-            <li>Add subtitles track</li>
+            <li>
+              <div id="show_web">Export for web</div>
+            </li>
+            <li>
+              <div id="show_add_subtitles">Add subtitles track</div>
+            </li>
             <li>Remove audio track</li>
             <li>Add audio track</li>
           </ul>
@@ -22,13 +26,11 @@
   <div id="formloader">
     <div class="display_info" style="display:none;">
     <%= render "display_info" %>
+    </div>
+    <div class="web" style="display:none;">
+    <%= render "web" %>
+    </div>
+    <div class="add_subtitles" style="display:none;">
+    <%= render "add_subtitles" %>
+    </div>
   </div>
-  </div>
-
-<%#= render "web" %> 
-
-<script>
-$( "#show_display_info" ).click(function() {
-  $( ".display_info" ).toggle();
-}); 
-</script>
\ No newline at end of file