Some UI changes
Lots of UI changes.