Fixes on nav bar and modal.