diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 7302965..7b7c7bd 100755
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -17,19 +17,18 @@ class AdminController < ApplicationController
     else
       @analytics = Analytics.all
     end
-    render "layouts/admin/_analytics"
   end
 
   def get_all_users
     @users = User.all
-    render :partial => "layouts/admin/get_all_users"
+    render layout: false
   end
 
   def get_user
     @user = User.find_by_id(params[:admin_id].to_s)
     arr = ["true", "false"]
     @admin_select = @user.admin ? arr : arr.reverse
-    render :partial => "layouts/admin/get_user"
+    render layout: false
   end
 
   def update_user
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index cff7eb5..0c19f07 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -15,12 +15,12 @@ class DashboardController < ApplicationController
   end
 
   def bar_graph
-    render :partial => "layouts/dashboard/bar_graph"
+    render :bar_graph, layout: false
   end
 
   def pie_charts
      @user = current_user
-     render :partial => "layouts/dashboard/dashboard_stats"
+     render :dashboard_stats, layout: false
   end
 
 end
diff --git a/app/controllers/tutorials_controller.rb b/app/controllers/tutorials_controller.rb
index e4ff5cf..8f2f69e 100755
--- a/app/controllers/tutorials_controller.rb
+++ b/app/controllers/tutorials_controller.rb
@@ -3,7 +3,7 @@ class TutorialsController < ApplicationController
   skip_before_action :authenticated
 
   def credentials
-    render :partial => "layouts/tutorial/credentials/creds"
+    render layout: false
   end
 
 end
diff --git a/app/views/layouts/admin/_analytics.html.erb b/app/views/admin/analytics.html.erb
similarity index 100%
rename from app/views/layouts/admin/_analytics.html.erb
rename to app/views/admin/analytics.html.erb
diff --git a/app/views/layouts/admin/_get_all_users.html.erb b/app/views/admin/get_all_users.html.erb
similarity index 100%
rename from app/views/layouts/admin/_get_all_users.html.erb
rename to app/views/admin/get_all_users.html.erb
diff --git a/app/views/layouts/admin/_get_user.html.erb b/app/views/admin/get_user.html.erb
similarity index 100%
rename from app/views/layouts/admin/_get_user.html.erb
rename to app/views/admin/get_user.html.erb
diff --git a/app/views/layouts/dashboard/_bar_graph.html.erb b/app/views/dashboard/bar_graph.html.erb
similarity index 100%
rename from app/views/layouts/dashboard/_bar_graph.html.erb
rename to app/views/dashboard/bar_graph.html.erb
diff --git a/app/views/layouts/dashboard/_dashboard_stats.html.erb b/app/views/dashboard/dashboard_stats.html.erb
similarity index 100%
rename from app/views/layouts/dashboard/_dashboard_stats.html.erb
rename to app/views/dashboard/dashboard_stats.html.erb
diff --git a/app/views/dashboard/home.html.erb b/app/views/dashboard/home.html.erb
index cee5c39..36e5d6b 100644
--- a/app/views/dashboard/home.html.erb
+++ b/app/views/dashboard/home.html.erb
@@ -21,7 +21,7 @@
 				  <!-- End Title Buttons-->
 			    </div>
 			    <div id="charts_body" class="widget-body">
-				      <%#= render :partial => "layouts/dashboard/dashboard_stats"%>
+				      <%#= render partial: "dashboard_stats" %>
 			    </div>
 				<div class="clearfix">
 		        </div>
diff --git a/app/views/layouts/tutorial/credentials/_creds.html.erb b/app/views/tutorials/credentials.html.erb
similarity index 100%
rename from app/views/layouts/tutorial/credentials/_creds.html.erb
rename to app/views/tutorials/credentials.html.erb