Updated nav bar and error messages