Jaideep/Rahul | Minor refactoring for the logic around hiding unnecessary navigation items