Ui murph

Changes to UI stuff.

Some are really opinions (like changes to API names), so feel free to reject if you disagree.