Continued work on UI updates.