A few UI updates. Mostly done.