Fixes for the nav bar and alert