better nav bar and other small fixes