diff --git a/src/assets/scripts/ads-add/ads-add.html b/src/assets/scripts/ads-add/ads-add.html
index c2cd559..1e194ed 100644
--- a/src/assets/scripts/ads-add/ads-add.html
+++ b/src/assets/scripts/ads-add/ads-add.html
@@ -2,7 +2,7 @@
 <div class="page-container">
   <nw-topbar></nw-topbar>
 
-  <main class='main-content bgc-grey-300'>
+  <main class='main-content bgc-grey-300' data-ng-controller="AdsAddController">
     <div id='mainContent row'>
 
       <div class="row content-title mT-60">
diff --git a/src/assets/scripts/ads-details/ads-details.html b/src/assets/scripts/ads-details/ads-details.html
index 0d20b8e..65bb18c 100644
--- a/src/assets/scripts/ads-details/ads-details.html
+++ b/src/assets/scripts/ads-details/ads-details.html
@@ -1,7 +1,7 @@
 <nw-sidebar></nw-sidebar>
 <div class="page-container">
   <nw-topbar></nw-topbar>
-  <main class='main-content bgc-grey-300'>
+  <main class='main-content bgc-grey-300' data-ng-controller="AdsDetailsController">
     <div id='mainContent row'>
 
       <div class="content-title mT-60">
diff --git a/src/assets/scripts/ads/ads.html b/src/assets/scripts/ads/ads.html
index 2ca6c72..b371380 100644
--- a/src/assets/scripts/ads/ads.html
+++ b/src/assets/scripts/ads/ads.html
@@ -2,7 +2,7 @@
 <div class="page-container">
   <nw-topbar></nw-topbar>
 
-  <main class='main-content bgc-grey-300'>
+  <main class='main-content bgc-grey-300' data-ng-controller="AdsController">
     <div id='mainContent row'>
       <div class="row content-title mT-60  visible-admin visible-nomit visible-referee" ng-show="user.role =='admin' || user.role =='nomit' || user.role =='referee' ">
         <h1 class="col-8 col-md-8 ml-1 mb-4">All Published Ads</h1>
diff --git a/src/assets/scripts/companies/companies.html b/src/assets/scripts/companies/companies.html
index a30542a..7a1ed9a 100644
--- a/src/assets/scripts/companies/companies.html
+++ b/src/assets/scripts/companies/companies.html
@@ -1,7 +1,7 @@
 <nw-sidebar></nw-sidebar>
 <div class="page-container">
   <nw-topbar></nw-topbar>
-  <main class='main-content'>
+  <main class='main-content' data-ng-controller="CompaniesController">
     <div id='mainContent row'>
       <div class="row content-title mT-60">
         <h1 class="col-8 ml-1 mb-4">Companies</h1>
diff --git a/src/assets/scripts/company-details/company-details.html b/src/assets/scripts/company-details/company-details.html
index 0890c6b..7a113b5 100644
--- a/src/assets/scripts/company-details/company-details.html
+++ b/src/assets/scripts/company-details/company-details.html
@@ -1,7 +1,7 @@
 <nw-sidebar></nw-sidebar>
 <div class="page-container">
   <nw-topbar></nw-topbar>
-  <main class='main-content bgc-grey-300'>
+  <main class='main-content bgc-grey-300' data-ng-controller="CompanyDetailsService">
     <div id='mainContent row'>
       <div class="content-title mT-60">
         <div class="ml-1 mb-3">
diff --git a/src/assets/scripts/history/history.html b/src/assets/scripts/history/history.html
index 34497d3..10da6e5 100644
--- a/src/assets/scripts/history/history.html
+++ b/src/assets/scripts/history/history.html
@@ -1,7 +1,7 @@
 <nw-sidebar></nw-sidebar>
 <div class="page-container">
   <nw-topbar></nw-topbar>
-  <main class='main-content bgc-grey-300'>
+  <main class='main-content bgc-grey-300' data-ng-controller="HistoryController">
     <div id='mainContent row'>
       <div class="row content-title mT-60">
         <h1 class="col-8 ml-1 mb-3">
diff --git a/src/assets/scripts/nwSidebar/nwSidebar.html b/src/assets/scripts/nwSidebar/nwSidebar.html
index aead209..d799aac 100644
--- a/src/assets/scripts/nwSidebar/nwSidebar.html
+++ b/src/assets/scripts/nwSidebar/nwSidebar.html
@@ -1,5 +1,5 @@
 <!-- #Left Sidebar ==================== -->
-<div class="sidebar bg-img">
+<div class="sidebar bg-img" data-ng-controller="SidebarController">
   <div class="sidebar-inner ">
     <!-- ### $Sidebar Header ### -->
     <div class="sidebar-logo">
@@ -282,14 +282,6 @@
           <span class="title text-white font-weight-bold">History</span>
         </a>
       </li>
-
-    
-
     </ul>
-
-
-
-
-
   </div>
 </div>
diff --git a/src/assets/scripts/nwTopbar/index.js b/src/assets/scripts/nwTopbar/index.js
index 0c79693..c4bbdb0 100644
--- a/src/assets/scripts/nwTopbar/index.js
+++ b/src/assets/scripts/nwTopbar/index.js
@@ -2,8 +2,8 @@ import angular from 'angular';
 import TopbarController from './topbar.controller';
 
 angular.module('NomitWisp-Topbar', [])
-    .controller(TopbarController.name, TopbarController)
-    .directive('nwTopbar', nwTopbar);
+    .directive('nwTopbar', nwTopbar)
+    .controller(TopbarController.name, TopbarController);
 
 /** @ngInject */
 function nwTopbar(){
diff --git a/src/assets/scripts/nwTopbar/nwTopbar.html b/src/assets/scripts/nwTopbar/nwTopbar.html
index 0446f5b..cafa01d 100644
--- a/src/assets/scripts/nwTopbar/nwTopbar.html
+++ b/src/assets/scripts/nwTopbar/nwTopbar.html
@@ -1,5 +1,5 @@
 <!-- ### $Topbar ### -->
-<div class="header navbar topbar" id="topbar">
+<div class="header navbar topbar" id="topbar" data-ng-controller="TopbarController">
   <div class="header-container">
     <!-- #LEFT ============================ -->
     <ul class="nav-left">
diff --git a/src/assets/scripts/referees/referees.html b/src/assets/scripts/referees/referees.html
index 4834907..3f29d6d 100644
--- a/src/assets/scripts/referees/referees.html
+++ b/src/assets/scripts/referees/referees.html
@@ -2,7 +2,7 @@
 <div class="page-container">
   <nw-topbar></nw-topbar>
 
-  <main class='main-content'>
+  <main class='main-content' data-ng-controller="RefereesController">
     <div id='mainContent row'>
       <div class="row content-title mT-60">
         <h1 class="col-8 ml-1 mb-4">Referees</h1>
diff --git a/src/assets/scripts/reports/reports.html b/src/assets/scripts/reports/reports.html
index 4ed0458..9b77542 100644
--- a/src/assets/scripts/reports/reports.html
+++ b/src/assets/scripts/reports/reports.html
@@ -1,7 +1,7 @@
 <nw-sidebar></nw-sidebar>
 <div class="page-container">
   <nw-topbar></nw-topbar>
-  <main class='main-content'>
+  <main class='main-content' data-ng-controller="ReportsController">
     <div id='mainContent row'>
       <div class="row content-title mT-60">
         <h1 class="col-8 ml-1 mb-3">
diff --git a/src/assets/scripts/signup/signup.html b/src/assets/scripts/signup/signup.html
index 2ff5375..03cf24a 100644
--- a/src/assets/scripts/signup/signup.html
+++ b/src/assets/scripts/signup/signup.html
@@ -6,7 +6,7 @@
       </div>
     </div>
   </div>
-  <div ng-controller="SignupController" class="col-7  peer pX-40 pY-80 h-100 bgc-white scrollable pos-r" style='min-width: 320px;'>
+  <div data-ng-controller="SignupController" class="col-7  peer pX-40 pY-80 h-100 bgc-white scrollable pos-r" style='min-width: 320px;'>
     <h1 class="">Register</h1>
     <form ng-submit="userSignup()" name="SignupForm">
         <div class="profile-forms">
diff --git a/src/assets/scripts/user-add/user-add.html b/src/assets/scripts/user-add/user-add.html
index d51f4a8..1c7f347 100644
--- a/src/assets/scripts/user-add/user-add.html
+++ b/src/assets/scripts/user-add/user-add.html
@@ -1,7 +1,7 @@
 <nw-sidebar></nw-sidebar>
 <div class="page-container">
   <nw-topbar></nw-topbar>
-  <main class='main-content bgc-grey-300'>
+  <main class='main-content bgc-grey-300' data-ng-controller="UserAddController">
     <div id='mainContent row'>
       <div class="content-title mT-60">
         <div class="ml-1 mb-3">
diff --git a/src/assets/scripts/user-details/user-details.html b/src/assets/scripts/user-details/user-details.html
index ef416d7..a6effff 100644
--- a/src/assets/scripts/user-details/user-details.html
+++ b/src/assets/scripts/user-details/user-details.html
@@ -1,7 +1,7 @@
 <nw-sidebar></nw-sidebar>
 <div class="page-container">
   <nw-topbar></nw-topbar>
-  <main class='main-content bgc-grey-300'>
+  <main class='main-content bgc-grey-300' data-ng-controller="UserDetailsController">
     <div id='mainContent row'>
       <div class="content-title mT-60">
         <div class="ml-1 mb-3">
diff --git a/src/assets/scripts/users/users.html b/src/assets/scripts/users/users.html
index b69422c..69179f7 100644
--- a/src/assets/scripts/users/users.html
+++ b/src/assets/scripts/users/users.html
@@ -1,7 +1,7 @@
 <nw-sidebar></nw-sidebar>
 <div class="page-container">
   <nw-topbar></nw-topbar>
-  <main class='main-content' ng-controller="UsersController" id="users">
+  <main class='main-content' data-ng-controller="UsersController" id="users">
     <div id='mainContent row'>
       <div class="row content-title mT-60">
         <h1 class="col-8 ml-1 mb-4">Users</h1>