Updated to use new navbar format