More UI changes and updates.