UI Update

Now matches model from Google Drive