diff --git a/app/controllers/admin/venue_commercials_controller.rb b/app/controllers/admin/venue_commercials_controller.rb
index d46b858b..3b8b51e0 100644
--- a/app/controllers/admin/venue_commercials_controller.rb
+++ b/app/controllers/admin/venue_commercials_controller.rb
@@ -10,10 +10,10 @@ module Admin
 
       #FIXME redirect to tab#commercial
       if @commercial.save
-        redirect_to admin_conference_venue_path,
+        redirect_to edit_admin_conference_venue_path,
                     notice: 'Commercial was successfully created.'
       else
-        redirect_to admin_conference_venue_path,
+        redirect_to edit_admin_conference_venue_path,
                     error: 'An error prohibited this Commercial from being saved: '\
                     "#{@commercial.errors.full_messages.join('. ')}."
 
@@ -22,10 +22,10 @@ module Admin
 
     def update
       if @commercial.update(commercial_params)
-        redirect_to admin_conference_venue_path,
+        redirect_to edit_admin_conference_venue_path,
                     notice: 'Commercial was successfully updated.'
       else
-        redirect_to admin_conference_venue_path,
+        redirect_to edit_admin_conference_venue_path,
                     error: 'An error prohibited this Commercial from being saved: '\
                     "#{@commercial.errors.full_messages.join('. ')}."
       end
@@ -33,7 +33,7 @@ module Admin
 
     def destroy
       @commercial.destroy
-      redirect_to admin_conference_venue_path, notice: 'Commercial was successfully destroyed.'
+      redirect_to edit_admin_conference_venue_path, notice: 'Commercial was successfully destroyed.'
     end
 
     def render_commercial
diff --git a/app/views/admin/venues/_form.html.haml b/app/views/admin/venues/_form.html.haml
index 639008ea..d40779ee 100644
--- a/app/views/admin/venues/_form.html.haml
+++ b/app/views/admin/venues/_form.html.haml
@@ -2,40 +2,52 @@
   .col-md-12
     .page-header
       %h1 Venue
-.row
-  .col-md-8
-    = semantic_form_for(@venue, url: admin_conference_venue_path(@conference.short_title)) do |f|
-      = f.inputs :name, :website
-      = f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint
-      = f.inputs :street, :postalcode, :city, :country, :latitude, :longitude
-      - unless @venue.photo.blank?
-        = image_tag @venue.photo(:thumb)
-      = f.input :photo
-      = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
+.tabbable
+  %ul.nav.nav-tabs
+    %li.active
+      = link_to 'Details', '#details-content', 'data-toggle' => 'tab'
+    %li
+      = link_to 'Commercials', '#commercials-content', 'data-toggle' => 'tab'
+  
+  .tab-content
+    #details-content.tab-pane.active
+      .col-md-8
+        = semantic_form_for(@venue, url: admin_conference_venue_path(@conference.short_title)) do |f|
+          = f.inputs :name, :website
+          = f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint
+          = f.inputs :street, :postalcode, :city, :country, :latitude, :longitude
+          - unless @venue.photo.blank?
+            = image_tag @venue.photo(:thumb)
+          = f.input :photo
+          = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
 
-  .row
-    .col-md-6
-      #resource-content
-      #resource-placeholder{ style: 'background-color:#d3d3d3; float: left; width: 400px; height: 250px; margin: 5px; border-width: 1px; border-style: solid; border-color: rgba(0,0,0,.2);' }
-  .row
-    .col-md-6
-      = semantic_form_for(@venue.create_commercial,as: :commercial, url: admin_conference_venue_venue_commercial_path(conference_id: @conference.short_title)) do |f|
-        = f.input :url, label: 'URL', as: :string, input_html: { required: 'required', type: 'url' },
-        hint: 'Just paste the url of your video/photo provider. Currently supported: YouTube, Vimeo, SpeakerDeck, SlideShare, Instagram, Flickr.'
-        = f.action :submit, as: :button, button_html: { class: 'btn btn-primary pull-right', disabled: true }
-  %hr
-- @venue.commercial do |commercial|
-  - if commercial.persisted?
-    .col-md-4
-      .thumbnail
-        .flexvideo{ id: "resource-content-#{commercial.id}"}
-          = render partial: 'shared/media_item', locals: { commercial: commercial }
-        .caption
-          - if can? :update, commercial
-            = semantic_form_for commercial, url: admin_conference_venue_venue_commercial_path(conference_id: @conference.short_title, id: commercial) do |f|
-              = f.input :url, label: 'URL', as: :string, input_html: { id: "commercial_url_#{commercial.id}", required: 'required' }, hint: 'Just paste the url of your video/photo provider'
-              = f.action :submit, as: :button, button_html: { class: 'btn btn-success' }, label: 'Update'
-              - if can? :destroy, commercial
-                = link_to 'Delete', admin_conference_venue_venue_commercial_path(@conference.short_title, commercial.id),
-                  method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger'
-  %hr
+    #commercials-content.tab-pane
+      - if @venue
+        .row
+          .col-md-6
+            #resource-content
+            #resource-placeholder{ style: 'background-color:#d3d3d3; float: left; width: 400px; height: 250px; margin: 5px; border-width: 1px; border-style: solid; border-color: rgba(0,0,0,.2);' }
+        .row
+          .col-md-6
+            = semantic_form_for(@venue.create_commercial,as: :commercial, url: admin_conference_venue_venue_commercial_path(conference_id: @conference.short_title)) do |f|
+              = f.input :url, label: 'URL', as: :string, input_html: { required: 'required', type: 'url' },
+              hint: 'Just paste the url of your video/photo provider. Currently supported: YouTube, Vimeo, SpeakerDeck, SlideShare, Instagram, Flickr.'
+              = f.action :submit, as: :button, button_html: { class: 'btn btn-primary pull-right', disabled: true }
+        %hr
+        - @venue.commercial do |commercial|
+          - if commercial.persisted?
+            .col-md-4
+              .thumbnail
+                .flexvideo{ id: "resource-content-#{commercial.id}"}
+                  = render partial: 'shared/media_item', locals: { commercial: commercial }
+                .caption
+                  - if can? :update, commercial
+                    = semantic_form_for commercial, url: admin_conference_venue_venue_commercial_path(conference_id: @conference.short_title, id: commercial.id) do |f|
+                      = f.input :url, label: 'URL', as: :string, input_html: { id: "commercial_url_#{commercial.id}", required: 'required' }, hint: 'Just paste the url of your video/photo provider'
+                      = f.action :submit, as: :button, button_html: { class: 'btn btn-success' }, label: 'Update'
+                      - if can? :destroy, commercial
+                        = link_to 'Delete', admin_conference_venue_venue_commercial_path(@conference.short_title, commercial.id),
+                          method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger'
+        %hr
+      - else
+        hint: 'First Create Venue, then update commercial'