Updated UI Mockup (working with Emmett)