diff --git a/app/controllers/campaigns_controller.rb b/app/controllers/campaigns_controller.rb
index 6072fc6..c838612 100644
--- a/app/controllers/campaigns_controller.rb
+++ b/app/controllers/campaigns_controller.rb
@@ -22,7 +22,6 @@ class CampaignsController < ApplicationController
 
   def edit
     @action = campaign_path(@campaign.clientid)
-
   end
 
 
@@ -54,7 +53,8 @@ class CampaignsController < ApplicationController
 
   private
     def set_campaign
-      @campaign = Campaign.find_by_clientid(params[:clientid]) || not_found
+      clientid = params[:clientid].to_s.gsub(/\D/, '').to_i
+      @campaign = Campaign.find_by_clientid(clientid) || Campaign.find_by_clientid(params[:campaign][:clientid]) || not_found
     end
 
     def campaign_params
@@ -73,7 +73,6 @@ class CampaignsController < ApplicationController
       raise ActionController::RoutingError.new("Not Found by clientid")
     end
 
-
     def set_api_key
       @BETTER_VIDEO_API_KEY = ENV['BETTER_VIDEO_API_KEY']
       @BETTER_VIDEO_API_KEY ||= "propel test key"
diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index 43a5400..63e367c 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -6,6 +6,8 @@ class Campaign < ActiveRecord::Base
   validates :listingcode, presence: true, uniqueness: true
   validates :advertisername, presence: true
   validates :websiteurl, presence: true
+  validates :description, presence: true
+  validates :productsandservices, presence: true
 
   after_create :send_to_better_video
   def send_to_better_video
diff --git a/app/models/videolisting.rb b/app/models/videolisting.rb
index 9cdc036..1f47c4d 100644
--- a/app/models/videolisting.rb
+++ b/app/models/videolisting.rb
@@ -2,6 +2,9 @@ class Videolisting < ActiveRecord::Base
   belongs_to :campaign
   validates :videocode, presence: true, uniqueness: true
   validates :producttypeid, presence: true
+  validates :voiceoverselection, presence: true
+  validates :musicselection, presence: true
+
 
   def asseturls_array
     self.asseturls.split(',').collect { |url| { asseturl: url.strip } }
diff --git a/app/views/campaigns/_videolisting.html.erb b/app/views/campaigns/_videolisting.html.erb
new file mode 100644
index 0000000..ee59b16
--- /dev/null
+++ b/app/views/campaigns/_videolisting.html.erb
@@ -0,0 +1,38 @@
+<li>
+  <p>
+    <strong>videocode</strong>
+    <%= videolisting.videocode %>
+  </p>
+  <p>
+    <strong>producttypeid</strong>
+    <%= videolisting.producttypeid %>
+  </p>
+  <p>
+    <strong>voiceoverselection</strong>
+    <%= videolisting.voiceoverselection %>
+  </p>
+  <p>
+    <strong>musicselection</strong>
+    <%= videolisting.musicselection %>
+  </p>
+  <p>
+    <strong>clientprovidedscript</strong>
+    <%= videolisting.clientprovidedscript %>
+  </p>
+  <p>
+    <strong>keywords</strong>
+    <%= videolisting.keywords %>
+  </p>
+  <p>
+    <strong>focus</strong>
+    <%= videolisting.focus %>
+  </p>
+  <p>
+    <strong>notes</strong>
+    <%= videolisting.notes %>
+  </p>
+  <p>
+    <strong>asseturls</strong>
+    <%= videolisting.asseturls %>
+  </p>
+</li>
\ No newline at end of file
diff --git a/app/views/campaigns/show.html.erb b/app/views/campaigns/show.html.erb
index 474d175..f5dc29f 100644
--- a/app/views/campaigns/show.html.erb
+++ b/app/views/campaigns/show.html.erb
@@ -60,15 +60,6 @@
       <%= @campaign.customerlastname %>
     </p>
 
-    <p>
-      <strong>Salesrep:</strong>
-      <%= @campaign.salesrep %>
-    </p>
-
-    <p>
-      <strong>Salesrepemail:</strong>
-      <%= @campaign.salesrepemail %>
-    </p>
 
     <p>
       <strong>Businessphone:</strong>
@@ -76,6 +67,12 @@
     </p>
 
     <p>
+        <strong>Description:</strong>
+        <%= @campaign.description %>
+    </p>
+
+
+  <p>
       <strong>Contactphone:</strong>
       <%= @campaign.contactphone %>
     </p>
@@ -87,53 +84,12 @@
   </div>
   <div class="col-md-4">
     <ul>
-    <% @campaign.videolistings.each do |vl| %>
-      <li>
-        <p>
-            <strong>videocode</strong>
-          <%= vl.videocode %>
-        </p>
-        <p>
-            <strong>producttypeid</strong>
-          <%= vl.producttypeid %>
-        </p>
-        <p>
-            <strong>remoteassetsarchive</strong>
-          <%= vl.remoteassetsarchive %>
-        </p>
-        <p>
-            <strong>voiceoverselection</strong>
-          <%= vl.voiceoverselection %>
-        </p>
-        <p>
-            <strong>musicselection</strong>
-          <%= vl.musicselection %>
-        </p>
-        <p>
-            <strong>clientprovidedscript</strong>
-          <%= vl.clientprovidedscript %>
-        </p>
-        <p>
-            <strong>keywords</strong>
-          <%= vl.keywords %>
-        </p>
-        <p>
-            <strong>focus</strong>
-          <%= vl.focus %>
-        </p>
-        <p>
-            <strong>notes</strong>
-          <%= vl.notes %>
-        </p>
-        <p>
-            <strong>asseturls</strong>
-          <%= vl.asseturls %>
-        </p>
-      </li>
+    <% @campaign.videolistings.each do |videolisting| %>
+          <%= render 'videolisting', videolisting: videolisting %>
     <% end %>
 
     <% if @campaign.videolistings.empty? %>
-        No Video Listings for this Campaign.
+        <li>No Video Listings for this Campaign.</li>
     <% end %>
 
   </ul>