Updated UI Mockup