diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
new file mode 100644
index 0000000..2b238c7
--- /dev/null
+++ b/app/assets/config/manifest.js
@@ -0,0 +1,4 @@
+//= link policy_manager/application.css
+//= link policy_manager/application.js
+//= link_tree ../stylesheets .css
+//= link_tree ../javascripts .js
\ No newline at end of file
diff --git a/gdpr_rails.gemspec b/gdpr_rails.gemspec
index fc1f964..27c5781 100644
--- a/gdpr_rails.gemspec
+++ b/gdpr_rails.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency "redcarpet"
   s.add_dependency "will_paginate"
   s.add_dependency "aasm"
-  s.add_dependency "rubyzip", ">= 1.0.0"
+  s.add_dependency "rubyzip", ">= 1.0.0", "< 2"
   s.add_dependency "groupdate", "4.0.0"
   s.add_dependency "chartkick", ">= 3.2.0"
   #s.add_dependency "kaminari"
diff --git a/gemfiles/rails_5.2.1.gemfile.lock b/gemfiles/rails_5.2.1.gemfile.lock
index 2a4aaa5..8bd14d2 100644
--- a/gemfiles/rails_5.2.1.gemfile.lock
+++ b/gemfiles/rails_5.2.1.gemfile.lock
@@ -5,9 +5,9 @@ PATH
       aasm
       chartkick (>= 3.2.0)
       groupdate (= 4.0.0)
-      rails (>= 5.1.4, <= 6)
+      rails (>= 5.1.4, < 7)
       redcarpet
-      rubyzip (>= 1.0.0)
+      rubyzip (>= 1.0.0, < 2)
       will_paginate
 
 GEM
@@ -72,7 +72,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    chartkick (3.2.1)
+    chartkick (3.3.1)
     climate_control (0.2.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
@@ -182,7 +182,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    rubyzip (1.2.4)
+    rubyzip (1.3.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -210,7 +210,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    will_paginate (3.1.8)
+    will_paginate (3.2.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -236,4 +236,4 @@ DEPENDENCIES
   sqlite3 (= 1.4.1)
 
 BUNDLED WITH
-   1.16.6
+   2.0.2
diff --git a/gemfiles/rails_5.2.3.gemfile.lock b/gemfiles/rails_5.2.3.gemfile.lock
index 0f5e8e5..2ca2500 100644
--- a/gemfiles/rails_5.2.3.gemfile.lock
+++ b/gemfiles/rails_5.2.3.gemfile.lock
@@ -5,9 +5,9 @@ PATH
       aasm
       chartkick (>= 3.2.0)
       groupdate (= 4.0.0)
-      rails (>= 5.1.4, <= 6)
+      rails (>= 5.1.4, < 7)
       redcarpet
-      rubyzip (>= 1.0.0)
+      rubyzip (>= 1.0.0, < 2)
       will_paginate
 
 GEM
@@ -72,7 +72,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    chartkick (3.2.1)
+    chartkick (3.3.1)
     climate_control (0.2.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
@@ -182,7 +182,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    rubyzip (1.2.4)
+    rubyzip (1.3.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -210,7 +210,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    will_paginate (3.1.8)
+    will_paginate (3.2.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -236,4 +236,4 @@ DEPENDENCIES
   sqlite3 (= 1.4.1)
 
 BUNDLED WITH
-   1.16.6
+   2.0.2
diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock
index 58d8944..fb262d1 100644
--- a/gemfiles/rails_6.gemfile.lock
+++ b/gemfiles/rails_6.gemfile.lock
@@ -7,7 +7,7 @@ PATH
       groupdate (= 4.0.0)
       rails (>= 5.1.4, < 7)
       redcarpet
-      rubyzip (>= 1.0.0)
+      rubyzip (>= 1.0.0, < 2)
       will_paginate
 
 GEM
@@ -197,7 +197,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    rubyzip (2.0.0)
+    rubyzip (1.3.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -252,4 +252,4 @@ DEPENDENCIES
   sqlite3 (= 1.4.1)
 
 BUNDLED WITH
-   1.17.3
+   2.0.2
diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
index 2380984..c8e290c 100644
--- a/spec/dummy/app/assets/config/manifest.js
+++ b/spec/dummy/app/assets/config/manifest.js
@@ -2,4 +2,3 @@
 //= link_tree ../images
 //= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css
-//= link terms_manifest.js
diff --git a/spec/dummy/config/initializers/assets.rb b/spec/dummy/config/initializers/assets.rb
index 4b828e8..7168815 100644
--- a/spec/dummy/config/initializers/assets.rb
+++ b/spec/dummy/config/initializers/assets.rb
@@ -1,14 +1,16 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
+Rails.application.config.assets.paths << Rails.root.join("node_modules")
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
 # Rails.application.config.assets.precompile += %w( admin.js admin.css )
+
+Rails.application.config.assets.precompile += %w( policy_manager/application.css policy_manager/application.js )