expand nav bar, adjust naming