Updated UI with new navbar