Cleaning the controllers and notifications in navbar
resolving merge conflicts