Updating and adding some GUI elements from Mockups