Rewrite how nav bar is handled
NS++ 2.4.0.2