Update navbar
Fix Active menu items