Updated UI with navbar