Fixing some issues navigation bar