diff --git a/src/browser/window-manager.coffee b/src/browser/window-manager.coffee
index 1e910f94a..5a857e226 100644
--- a/src/browser/window-manager.coffee
+++ b/src/browser/window-manager.coffee
@@ -268,9 +268,12 @@ class WindowManager
       return @newColdWindow(options)
 
     supportedHotWindowKeys = [
+      "x"
+      "y"
       "title"
       "width"
       "height"
+      "bounds"
       "windowType"
       "windowProps"
     ]
@@ -293,6 +296,23 @@ class WindowManager
       win.setLoadSettings(newLoadSettings)
       win.showWhenLoaded()
 
+      win.browserWindow.setTitle options.title ? ""
+
+      if options.x and options.y
+        win.browserWindow.setPosition options.x, options.w
+
+      if options.width or options.height
+        [w,h] = win.browserWindow.getSize()
+        w = options.width ? w
+        h = options.height ? h
+        win.browserWindow.setSize(w,h)
+
+      console.log JSON.stringify(options)
+      if options.bounds
+        console.log "------------- SETTING BOUNDS"
+        console.log JSON.stringify(options.bounds)
+        win.browserWindow.setBounds options.bounds
+
     @_replenishHotWindows()
 
     return win
diff --git a/src/components/generated-form.cjsx b/src/components/generated-form.cjsx
index f34494fbb..ca251571c 100644
--- a/src/components/generated-form.cjsx
+++ b/src/components/generated-form.cjsx
@@ -105,15 +105,18 @@ class FormItem extends React.Component
     if _.last(label) isnt ":"
       label = "#{label}:"
 
-    <div className={classes}>
-      <div className="label-area">
-        <label>{label}</label>
+    if @props.type is "hidden"
+      @_renderInput()
+    else
+      <div className={classes}>
+        <div className="label-area">
+          <label>{label}</label>
+        </div>
+        <div className="input-area">
+          {@_renderInput()}
+          {@_renderError()}
+        </div>
       </div>
-      <div className="input-area">
-        {@_renderInput()}
-        {@_renderError()}
-      </div>
-    </div>
 
   # Since the validity state is something we need to pull off of rendered
   # DOM nodes we need to bend the React rules a bit and do a
@@ -300,7 +303,9 @@ class GeneratedForm extends React.Component
   render: =>
     <form className="generated-form" ref="form">
       {@_renderHeaderFormError()}
-      {@_renderFieldsets()}
+      <div className="fieldsets">
+        {@_renderFieldsets()}
+      </div>
       {@_renderHeaderFormError()}
       <div className="form-footer">
         <button onClick={@props.onSubmit}>Submit</button>