Updated to new navbar