diff --git a/public/modules/forms/config/forms.client.routes.js b/public/modules/forms/config/forms.client.routes.js
index 8cb8c3d4..0e0a1d21 100644
--- a/public/modules/forms/config/forms.client.routes.js
+++ b/public/modules/forms/config/forms.client.routes.js
@@ -1,18 +1,19 @@
 'use strict';
 
 // Setting up route
-angular.module('forms').config(['$stateProvider',
-	
-	function($stateProvider) {
+angular.module('forms').config([
+	'$stateProvider', '$templateCache',
+
+	function($stateProvider, $templateCache) {
 		// Forms state routing
 		$stateProvider.
 		state('listForms', {
 			url: '/forms',
-			templateUrl: 'modules/forms/views/list-forms.client.view.html'
+			template: $templateCache.get('modules/forms/views/list-forms.client.view.html')
   		}).
   		state('submitForm', {
 			url: '/forms/:formId',
-			templateUrl: 'modules/forms/views/submit-form.client.view.html',
+			template: $templateCache.get('modules/forms/views/submit-form.client.view.html'),
 			data: {
 				hideNav: true,
 			},
@@ -26,7 +27,7 @@ angular.module('forms').config(['$stateProvider',
             controllerAs: 'ctrl'
 		}).state('viewForm', {
 			url: '/forms/:formId/admin',
-			templateUrl: 'modules/forms/views/admin-form.client.view.html',
+			template: $templateCache.get('modules/forms/views/admin-form.client.view.html'),
 			data: {
 				permissions: [ 'editForm' ]
 			},
@@ -39,16 +40,16 @@ angular.module('forms').config(['$stateProvider',
 			controller: 'AdminFormController'
 		}).state('viewForm.configure', {
 			url: '/configure',
-			templateUrl: 'modules/forms/views/adminTabs/configure.html'
+			template: $templateCache.get('modules/forms/views/adminTabs/configure.html')
 	    }).state('viewForm.design', {
 			url: '/design',
-			templateUrl: 'modules/forms/views/adminTabs/design.html'
+			template: $templateCache.get('modules/forms/views/adminTabs/design.html')
 	    }).state('viewForm.analyze', {
 			url: '/analyze',
-			templateUrl: 'modules/forms/views/adminTabs/analyze.html',
+			template: $templateCache.get('modules/forms/views/adminTabs/analyze.html')
 	    }).state('viewForm.create', {
 			url: '/create',
-			templateUrl: 'modules/forms/views/adminTabs/create.html'
+			template: $templateCache.get('modules/forms/views/adminTabs/create.html')
 	    });
 	}
 ]);
diff --git a/public/modules/forms/controllers/admin-form.client.controller.js b/public/modules/forms/controllers/admin-form.client.controller.js
index ec11a342..fff79ad9 100644
--- a/public/modules/forms/controllers/admin-form.client.controller.js
+++ b/public/modules/forms/controllers/admin-form.client.controller.js
@@ -1,8 +1,12 @@
 'use strict';
 
 // Forms controller
-angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope', '$stateParams', '$state', 'Forms', 'CurrentForm', '$http', '$uibModal', 'myForm',
-	function($rootScope, $scope, $stateParams, $state, Forms, CurrentForm, $http, $uibModal, myForm) {
+angular.module('forms').controller('AdminFormController', [
+	'$rootScope', '$scope', '$stateParams', '$state', 'Forms',
+	'CurrentForm', '$http', '$uibModal', 'myForm',
+
+	function($rootScope, $scope, $stateParams, $state, Forms,
+			CurrentForm, $http, $uibModal, myForm) {
 
         $scope = $rootScope;
         $scope.animationsEnabled = true;
@@ -39,8 +43,8 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
             });
         };
 
-        /* 
-        ** DeleteModal Functions 
+        /*
+        ** DeleteModal Functions
         */
         $scope.openDeleteModal = function(){
             $scope.deleteModal = $uibModal.open({
@@ -72,15 +76,15 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
             if($scope.deleteModal && $scope.deleteModal.opened){
 
                 $scope.deleteModal.close();
-            
+
                 var form_id = $scope.myform._id;
                 if(!form_id) throw new Error('Error - removeCurrentForm(): $scope.myform._id does not exist');
-        
+
                 $http.delete('/forms/'+form_id)
                     .success(function(data, status, headers){
                         console.log('form deleted successfully');
 
-                        $state.go('listForms', {}, {reload: true}); 
+                        $state.go('listForms', {}, {reload: true});
 
                     }).error(function(error){
                         console.log('ERROR: Form could not be deleted.');
@@ -96,7 +100,7 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
             if(!updateImmediately){
                 continueUpdate = !$rootScope.saveInProgress;
             }
-            
+
             //Update form **if we are not currently updating** or if **shouldUpdateNow flag is set**
             if(continueUpdate){
                 var err = null;
@@ -111,12 +115,12 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
                         console.log('Error occured during form UPDATE.\n');
                         // console.log(response.data);
                         err = response.data;
-                    }).finally(function() { 
+                    }).finally(function() {
                         // console.log('finished updating');
                         if(!updateImmediately){$rootScope.saveInProgress = false; }
 
                         if( (typeof cb) === 'function'){
-                            cb(err); 
+                            cb(err);
                         }
                     });
             }
@@ -124,4 +128,4 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
 
 
 	}
-]);
\ No newline at end of file
+]);
diff --git a/public/modules/forms/directives/configure-form.client.directive.js b/public/modules/forms/directives/configure-form.client.directive.js
index 68062a38..224cfb49 100644
--- a/public/modules/forms/directives/configure-form.client.directive.js
+++ b/public/modules/forms/directives/configure-form.client.directive.js
@@ -1,9 +1,10 @@
 'use strict';
 
-angular.module('forms').directive('configureFormDirective', ['$rootScope', '$http', 'Upload', 'CurrentForm',
-    function ($rootScope, $http, Upload, CurrentForm) {
+angular.module('forms').directive('configureFormDirective', [
+	'$rootScope', '$http', 'Upload', 'CurrentForm', '$templateCache',
+    function ($rootScope, $http, Upload, CurrentForm, $templateCache) {
         return {
-            templateUrl: 'modules/forms/views/directiveViews/form/configure-form.client.view.html',
+            template: $templateCache.get('modules/forms/views/directiveViews/form/configure-form.client.view.html'),
             restrict: 'E',
             scope: {
                 myform:'=',
@@ -21,7 +22,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$htt
                 $scope.log = '';
                 $scope.pdfLoading = false;
                 $scope.languages = $rootScope.languages;
-                
+
                 this._current_upload = null;
                 $scope.resetForm = $rootScope.resetForm;
                 $scope.update = $rootScope.update;
@@ -66,7 +67,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$htt
                             var progressPercentage = parseInt(100.0 * evt.loaded / evt.total);
                             $scope.log = 'progress: ' + progressPercentage + '% ' +
                                         evt.config.file.name + '\n' + $scope.log;
-                                        
+
                             $scope.pdfLoading = true;
                         }).success(function (data, status, headers, config) {
                             $scope.log = 'file ' + data.originalname + ' uploaded as '+ data.name +'. JSON: ' + JSON.stringify(data) + '\n' + $scope.log;
@@ -91,4 +92,4 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$htt
             }
         };
     }
-]);
\ No newline at end of file
+]);
diff --git a/public/modules/forms/directives/edit-form.client.directive.js b/public/modules/forms/directives/edit-form.client.directive.js
index 066e60e9..ec2fbef7 100644
--- a/public/modules/forms/directives/edit-form.client.directive.js
+++ b/public/modules/forms/directives/edit-form.client.directive.js
@@ -1,9 +1,10 @@
 'use strict';
 
-angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormFields',
-    function ($rootScope, FormFields) {
+angular.module('forms').directive('editFormDirective', [
+    '$rootScope', 'FormFields', '$templateCache',
+    function ($rootScope, FormFields, $templateCache) {
         return {
-            templateUrl: 'modules/forms/views/directiveViews/form/edit-form.client.view.html',
+            template: $templateCache.get('modules/forms/views/directiveViews/form/edit-form.client.view.html'),
             restrict: 'E',
             scope: {
                 myform:'=',
@@ -45,7 +46,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
 
                         if( $scope.myform.plugins.oscarhost.settings.fieldMap.hasOwnProperty(field_id) ){
                             currentFields = _(currentFields).difference($scope.myform.plugins.oscarhost.settings.fieldMap[field_id]);
-                        } 
+                        }
 
                         //Get all oscarhostFields that haven't been mapped to a formfield
                         return _(oscarhostFields).difference(currentFields).value();
@@ -73,9 +74,9 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
                     var fieldTitle;
 
                     for(var i = 0; i < $scope.addField.types.length; i++){
-                        if($scope.addField.types[i].name === fieldType){ 
+                        if($scope.addField.types[i].name === fieldType){
                             $scope.addField.types[i].lastAddedID++;
-                            fieldTitle = $scope.addField.types[i].value+$scope.addField.types[i].lastAddedID;  
+                            fieldTitle = $scope.addField.types[i].value+$scope.addField.types[i].lastAddedID;
                             break;
                         }
                     }
@@ -90,12 +91,12 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
                     // console.log('\n\n---------\nAdded field CLIENT');
                     // console.log(newField);
                     // newField._id = _.uniqueId();
-                    
+
                     // put newField into fields array
                     if(modifyForm){
                         $scope.myform.form_fields.push(newField);
                     }
-                    return newField;    
+                    return newField;
                 };
 
                 // Delete particular field on button click
@@ -109,7 +110,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
                     $scope.myform.form_fields.splice(field_index, 1);
                 };
                 $scope.duplicateField = function (field_index){
-                    var currField = _.cloneDeep($scope.myform.form_fields[field_index]);  
+                    var currField = _.cloneDeep($scope.myform.form_fields[field_index]);
                     currField._id = 'cloned'+_.uniqueId();
                     currField.title += ' copy';
 
@@ -158,8 +159,8 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
                 $scope.addOption = function(field_index){
                     var currField = $scope.myform.form_fields[field_index];
 					console.log(field_index);
-					console.log(currField);	
-                    
+					console.log(currField);
+
 					if(currField.fieldType === 'checkbox' || currField.fieldType === 'dropdown' || currField.fieldType === 'radio'){
                         if(!currField.fieldOptions) $scope.myform.form_fields[field_index].fieldOptions = [];
 
@@ -209,7 +210,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
                 };
 
             },
-  
+
         };
     }
 ]);
diff --git a/public/modules/forms/directives/edit-submissions-form.client.directive.js b/public/modules/forms/directives/edit-submissions-form.client.directive.js
index fb2954e8..342a3bb3 100644
--- a/public/modules/forms/directives/edit-submissions-form.client.directive.js
+++ b/public/modules/forms/directives/edit-submissions-form.client.directive.js
@@ -1,9 +1,10 @@
 'use strict';
 
-angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope', '$http',
-    function ($rootScope, $http) {
+angular.module('forms').directive('editSubmissionsFormDirective', [
+	'$rootScope', '$http', '$templateCache',
+    function ($rootScope, $http, $templateCache) {
         return {
-            templateUrl: 'modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html',
+            template: $templateCache.get('modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html'),
             restrict: 'E',
             scope: {
                 myform:'=',
@@ -49,7 +50,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
                                 defaultFormFields = _.cloneDeep($scope.myform.form_fields);
 
                             // console.log('before textField2: '+data[0].form_fields[1].fieldValue);
-                            
+
                             //Iterate through form's submissions
                             for(var i=0; i<data.length; i++){
                                 for(var x=0; x<data[i].form_fields; x++){
@@ -69,8 +70,8 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
                         })
                         .error(function(err){
                             console.error('Could not fetch form submissions.\nError: '+err);
-                        });            
-                };  
+                        });
+                };
 
                 //Delete selected submissions of Form
                 $scope.deleteSelectedSubmissions = function(){
@@ -79,7 +80,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
                         return !!row.selected;
                     }).pluck('_id').value();
 
-                    $http({ url: '/forms/'+$scope.myform._id+'/submissions', 
+                    $http({ url: '/forms/'+$scope.myform._id+'/submissions',
                             method: 'DELETE',
                             data: {deleted_submissions: delete_ids},
                             headers: {'Content-Type': 'application/json;charset=utf-8'}
@@ -97,7 +98,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
                             console.log('Could not delete form submissions.\nError: ');
                             console.log(err);
                             console.error = err;
-                        });      
+                        });
                 };
 
                 //Export selected submissions of Form
diff --git a/public/modules/users/config/users.client.routes.js b/public/modules/users/config/users.client.routes.js
index 3565ec2d..d45a00c7 100755
--- a/public/modules/users/config/users.client.routes.js
+++ b/public/modules/users/config/users.client.routes.js
@@ -1,8 +1,9 @@
 'use strict';
 
 // Setting up route
-angular.module('users').config(['$stateProvider',
-	function($stateProvider) {
+angular.module('users').config([
+	'$stateProvider', '$templateCache',
+	function($stateProvider, $templateCache) {
 
 	var checkLoggedin = function($q, $timeout, $state, User, Auth) {
       var deferred = $q.defer();
@@ -34,64 +35,64 @@ angular.module('users').config(['$stateProvider',
           		loggedin: checkLoggedin
         	},
 			url: '/settings/profile',
-			templateUrl: 'modules/users/views/settings/edit-profile.client.view.html'
+			template: $templateCache.get('modules/users/views/settings/edit-profile.client.view.html')
 		}).
 		state('password', {
 			resolve: {
 	          	loggedin: checkLoggedin
 	        },
 			url: '/settings/password',
-			templateUrl: 'modules/users/views/settings/change-password.client.view.html'
+			template: $templateCache.get('modules/users/views/settings/change-password.client.view.html')
 		}).
 		state('accounts', {
 			resolve: {
 	          	loggedin: checkLoggedin
 	        },
 			url: '/settings/accounts',
-			templateUrl: 'modules/users/views/settings/social-accounts.client.view.html'
+			template: $templateCache.get('modules/users/views/settings/social-accounts.client.view.html')
 		}).
 
 		state('signup', {
 			url: '/signup',
-			templateUrl: 'modules/users/views/authentication/signup.client.view.html'
+			template: $templateCache.get('modules/users/views/authentication/signup.client.view.html')
 		}).
 		state('signup-success', {
 			url: '/signup-success',
-			templateUrl: 'modules/users/views/authentication/signup-success.client.view.html'
+			template: $templateCache.get('modules/users/views/authentication/signup-success.client.view.html')
 		}).
 		state('signin', {
 			url: '/signin',
-			templateUrl: 'modules/users/views/authentication/signin.client.view.html'
+			template: $templateCache.get('modules/users/views/authentication/signin.client.view.html')
 		}).
 		state('access_denied', {
 			url: '/access_denied',
-			templateUrl: 'modules/users/views/authentication/access-denied.client.view.html'
+			template: $templateCache.get('modules/users/views/authentication/access-denied.client.view.html')
 		}).
-		
+
 		state('resendVerifyEmail', {
 			url: '/verify',
-			templateUrl: 'modules/users/views/verify/resend-verify-email.client.view.html'
+			template: $templateCache.get('modules/users/views/verify/resend-verify-email.client.view.html')
 		}).
 		state('verify', {
 			url: '/verify/:token',
-			templateUrl: 'modules/users/views/verify/verify-account.client.view.html'
+			template: $templateCache.get('modules/users/views/verify/verify-account.client.view.html')
 		}).
 
 		state('forgot', {
 			url: '/password/forgot',
-			templateUrl: 'modules/users/views/password/forgot-password.client.view.html'
+			template: $templateCache.get('modules/users/views/password/forgot-password.client.view.html')
 		}).
 		state('reset-invalid', {
 			url: '/password/reset/invalid',
-			templateUrl: 'modules/users/views/password/reset-password-invalid.client.view.html'
+			template: $templateCache.get('modules/users/views/password/reset-password-invalid.client.view.html')
 		}).
 		state('reset-success', {
 			url: '/password/reset/success',
-			templateUrl: 'modules/users/views/password/reset-password-success.client.view.html'
+			template: $templateCache.get('modules/users/views/password/reset-password-success.client.view.html')
 		}).
 		state('reset', {
 			url: '/password/reset/:token',
-			templateUrl: 'modules/users/views/password/reset-password.client.view.html'
+			template: $templateCache.get('modules/users/views/password/reset-password.client.view.html')
 		});
 	}
-]);
\ No newline at end of file
+]);