Updated UI layout